Sync up 'install.yaml' with 'nsb_setup.yml'

[yardstick.git] / ansible / roles / install_dependencies_jumphost / tasks / Debian.yml

diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
index 419f81b..a229cc1 100755 (executable)
--- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
@@ -16,6 +16,12 @@
   apt:
     update_cache: yes
 
+- name: Install dependency for Ubuntu 18
+  action: "{{ ansible_pkg_mgr }} name=libssl1.0-dev state=present"
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_major_version|int >= 17
+
 - name: Install core packages
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
   with_items:
@@ -85,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 }}"