diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-06-19 14:45:15 +0200 |
|---|---|---|
| committer | Michal Zegan <m.zegan@samsung.com> | 2019-07-05 13:39:54 +0200 |
| commit | cb5c09e2c322a05cb4ae9b1582e24d07f574b1bc (patch) | |
| tree | ffd2909b30c4984144ae3fc4a09e85cab35349c2 | |
| parent | 0ca158b61574f50d16b9e472d29ee1f3e2d19dfa (diff) | |
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>
| -rw-r--r-- | ansible/test/roles/prepare-docker-dind/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-docker-dind/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-docker-dind/vars/main.yml | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/test/roles/prepare-docker-dind/defaults/main.yml b/ansible/test/roles/prepare-docker-dind/defaults/main.yml index 2489014e..147a828a 100644 --- 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 3e109e87..c0bf1543 100644 --- 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 index 950fb921..00000000 --- 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 |