Allow overriding docker version in prepare-docker-dind

This change allows overriding of docker version to be installed
when calling prepare-docker-dind role.
It also enables downgrading, allowing the
given version to be taken into account. Previously
the specified version was completely ignored.

Change-Id: Iee3827564f130498e9fad69ddea55278346b7cfe
Issue-ID: OOM-1906
Signed-off-by: Michal Zegan <m.zegan@samsung.com>

diff --git a/ansible/test/roles/prepare-docker-dind/defaults/main.yml b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
index 2489014..147a828 100644 (file)
--- a/ansible/test/roles/prepare-docker-dind/defaults/main.yml
+++ b/ansible/test/roles/prepare-docker-dind/defaults/main.yml
@@ -1,3 +1,5 @@
 ---
 # Variable specifying if we should install docker, or only prepare for it
 start_docker: true
+#The version of docker to install
+docker_version: 18.09.5

diff --git a/ansible/test/roles/prepare-docker-dind/tasks/main.yml b/ansible/test/roles/prepare-docker-dind/tasks/main.yml
index 3e109e8..c0bf154 100644 (file)
--- a/ansible/test/roles/prepare-docker-dind/tasks/main.yml
+++ b/ansible/test/roles/prepare-docker-dind/tasks/main.yml
@@ -20,4 +20,5 @@
   package:
     name: "docker-ce-{{ docker_version }}"
     state: present
+    allow_downgrade: true
   notify: Restart docker

diff --git a/ansible/test/roles/prepare-docker-dind/vars/main.yml b/ansible/test/roles/prepare-docker-dind/vars/main.yml
deleted file mode 100644 (file)
index 950fb92..0000000
--- a/ansible/test/roles/prepare-docker-dind/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-#The version of docker to install
-docker_version: 18.09.5