Change the docker role from container support to VM support
Change-Id: I7d09fe0ef2efc03b27951bec3731a3be99dabafc
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 4319c2d..e226127 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -7,23 +7,32 @@
dependency:
name: galaxy
driver:
- name: docker
+ name: vagrant
platforms:
- - name: "ubuntu-18.04-priv"
- image: "quay.io/paulfantom/molecule-systemd:ubuntu-18.04"
- privileged: true
- volumes:
- - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
- - name: "debian-10-priv"
- image: "quay.io/paulfantom/molecule-systemd:debian-10"
- privileged: true
- volumes:
- - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+ - name: instance
+ box: debian/bullseye64
+ memory: 512
+ cpus: 1
+# driver:
+# name: docker
+# platforms:
+# - name: "ubuntu-18.04-priv"
+# image: "quay.io/paulfantom/molecule-systemd:ubuntu-18.04"
+# privileged: true
+# volumes:
+# - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# - name: "debian-10-priv"
+# image: "quay.io/paulfantom/molecule-systemd:debian-10"
+# privileged: true
+# volumes:
+# - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
provisioner:
name: ansible
- inventory:
- host_vars:
- debian-10-priv:
- ansible_python_interpreter: /usr/bin/python3
+ options:
+ become: true
+# inventory:
+# host_vars:
+# debian-10-priv:
+# ansible_python_interpreter: /usr/bin/python3
verifier:
name: ansible
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 8e218ca..67152ee 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -11,6 +11,7 @@
- name: Check installed Docker version string
command:
cmd: "docker version"
+ become: true
register: docker_version
tags:
- skip_ansible_lint # info gathering
@@ -21,11 +22,12 @@
- name: Assert that installed Docker version matches version string
assert:
that:
- - "'Version: 19.03' in docker_version.stdout"
+ - "'Version: 20.10' in docker_version.stdout"
- name: Check docker daemon option exists
command:
cmd: "docker info -f {% raw %}'{{ index .RegistryConfig.Mirrors 0 }}'{% endraw %}"
+ become: true
register: docker_info
tags:
- skip_ansible_lint # info gathering
@@ -41,6 +43,7 @@
- name: Check installed Docker compose version string
command:
cmd: "docker-compose --version"
+ become: true
register: docker_compose_version
tags:
- skip_ansible_lint # info gathering
@@ -51,4 +54,4 @@
- name: Assert that installed Docker compose version matches version string
assert:
that:
- - "'docker-compose version 1.29.2' in docker_compose_version.stdout"
+ - "'Docker Compose version v2.3.4' in docker_compose_version.stdout"