Change the docker role from container support to VM support
Change-Id: I7d09fe0ef2efc03b27951bec3731a3be99dabafc
diff --git a/defaults/main.yml b/defaults/main.yml
index 663c6e8..7c2e4b8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,16 +4,16 @@
# SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
# SPDX-License-Identifier: Apache-2.0
+# Docker
+
docker_add_package_repo: true
-
-docker_version: "19.03"
-
+docker_version: "20.10"
docker_daemon_options: {}
# docker compose options
docker_install_compose: false
-docker_compose_version: "1.29.2"
+docker_compose_version: "2.3.4"
docker_compose_url: "https://github.com/docker/compose/releases/\
- download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
-docker_compose_checksum: "sha256:f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323"
+ download/v{{ docker_compose_version }}/docker-compose-Linux-x86_64"
+docker_compose_checksum: "sha256:bdb11922a5895895ea4be0aea6b9105bf4dd0a4cc3486a753d4afefe2caddbd2"
docker_compose_path: /usr/local/bin/docker-compose
diff --git a/meta/main.yml b/meta/main.yml
index 225ada5..808fad4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -21,7 +21,7 @@
- "18.04"
- name: Debian
versions:
- - "10"
+ - "11"
galaxy_tags:
- docker
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"
diff --git a/tasks/Debian-repo.yml b/tasks/Debian-repo.yml
index adf5c74..3473e15 100644
--- a/tasks/Debian-repo.yml
+++ b/tasks/Debian-repo.yml
@@ -4,6 +4,10 @@
# SPDX-FileCopyrightText: © 2021 Open Networking Foundation <support@opennetworking.org>
# SPDX-License-Identifier: Apache-2.0
+- name: Update apt cache
+ apt:
+ update_cache: true
+
- name: Install apt related prereqs
apt:
name:
@@ -12,7 +16,6 @@
- "gpg"
- "software-properties-common"
state: "present"
- update_cache: true
- name: Add Docker apt repo key
apt_key: