summaryrefslogtreecommitdiffstats
path: root/ansible/roles/install_dependencies_jumphost/tasks
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2019-01-07 15:29:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-07 15:29:27 +0000
commit75883619fb111a23ed32c30a3498665d79a1fb72 (patch)
tree90c604272c31ac391c37b3080e9a4659293ea8db /ansible/roles/install_dependencies_jumphost/tasks
parentfd5fdb646ae46819fe2f80e35d0d2630a620e8ee (diff)
parente2f48a4ac921ac56827a98ffa51545c7095c5a3f (diff)
Merge "Sync up 'install.yaml' with 'nsb_setup.yml'"
Diffstat (limited to 'ansible/roles/install_dependencies_jumphost/tasks')
-rwxr-xr-xansible/roles/install_dependencies_jumphost/tasks/Debian.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
index 6c3900d26..a229cc1a2 100755
--- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
@@ -91,8 +91,16 @@
- ansible_distribution == 'Ubuntu'
- ansible_distribution_major_version|int >= 17
+- name: Uninstall docker as it conflicts with docker-py
+ pip:
+ name:
+ - docker
+ state: absent
+
- name: Install required docker-py module
pip:
- name: docker-py
+ name:
+ - docker-py
+ - shade
state: latest
environment: "{{ proxy_env }}"