diff options
| author |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-05-21 07:07:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-21 07:07:25 +0000 |
| commit | 929d4391d688128f24b44e1bba7b68843263b03f (patch) | |
| tree | 7ce92e7afb2b65863c29a06591965cb1ecc21a53 /ansible/roles | |
| parent | 0fd7a5a84706db4083f514dd1cefc205fa43b7c6 (diff) | |
| parent | b5f99a2fff91001f14eb870369dc0a584e9c81c0 (diff) | |
Merge changes from topic "RHEL"
* changes:
Upgrade docker version to 18.09.5
Update of docker for RHEL
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/docker/handlers/main.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/docker/tasks/main.yml | 3 |
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' |