summaryrefslogtreecommitdiffstats
path: root/ansible/roles
diff options
context:
space:
mode:
authorStepan Andrushko <stepanx.andrushko@intel.com>2018-12-24 19:26:39 +0200
committerStepan Andrushko <stepanx.andrushko@intel.com>2018-12-28 15:41:43 +0200
commite2f48a4ac921ac56827a98ffa51545c7095c5a3f (patch)
tree44da08fe778183ae7513c823e4337518289b18ef /ansible/roles
parentb122686cb06e89420e9d8141df535f6c43de29ab (diff)
Sync up 'install.yaml' with 'nsb_setup.yml'
Add support for barometer container. Add VM image to OpenStack. JIRA: YARDSTICK-1573 Change-Id: I7946f080f93bb69b0380c9ea7f4d7e04cb284c15 Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'ansible/roles')
-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 }}"