summaryrefslogtreecommitdiffstats
path: root/ansible/roles
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-05-16 13:36:00 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-05-17 12:42:38 +0000
commitb5f99a2fff91001f14eb870369dc0a584e9c81c0 (patch)
tree13b7fb56e60af800be30c132fabf169b777d1d73 /ansible/roles
parenta82fa0d6493888a8e5b29f2c87d6675fddf0c1a9 (diff)
Upgrade docker version to 18.09.5
This patch upgrades docker version for Molecule tests to 18.09.5; it also sanitizes tasks in 'docker' role to supplement this change: https://gerrit.onap.org/r/c/87761/ Change-Id: I14beffafb129b24e7c15f8da45f1a25e27ccae9c Issue-ID: OOM-1852 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/docker/handlers/main.yml3
-rw-r--r--ansible/roles/docker/tasks/main.yml3
2 files changed, 5 insertions, 1 deletions
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml
index de4a52ac..9916a81b 100644
--- a/ansible/roles/docker/handlers/main.yml
+++ b/ansible/roles/docker/handlers/main.yml
@@ -1,3 +1,6 @@
---
- name: Restart Docker
import_tasks: docker_restart.yml
+ when:
+ - ansible_env.container is defined
+ - ansible_env.container != 'docker'
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 1925d09b..cd731b11 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -8,9 +8,10 @@
- name: Install docker python module
package:
- name: 'python2-docker'
+ name: 'python-docker-py'
state: present
+
- name: Install python jsonpointer module
package:
name: 'python-jsonpointer'