From 85644d1a6d5e6af361367321b7805d69c7e7f26e Mon Sep 17 00:00:00 2001
From: Stepan Andrushko <stepanx.andrushko@intel.com>
Date: Fri, 7 Sep 2018 15:15:08 +0300
Subject: Modify install.yaml to support Ubuntu 18

Modify install.yaml to be able to install Yardstick on the newest
Ubuntu 18.04 LTS. Yardstick installation on Ubuntu 16 is still
supported. Default version is Ubuntu 16.04 (xenial).

JIRA: YARDSTICK-1413

Change-Id: Ic8aca0699645c68831ee739deeaeceef418075f5
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
---
 .../install_dependencies_jumphost/tasks/Debian.yml | 24 +++++++++++++++++++---
 .../install_dependencies_jumphost/tasks/RedHat.yml |  1 +
 .../install_dependencies_jumphost/tasks/Suse.yml   |  6 ++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'ansible/roles/install_dependencies_jumphost')

diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
index 9baf7e59e..f1fb43827 100755
--- a/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/Debian.yml
@@ -33,16 +33,14 @@
     - libxft-dev
     - libxml2-dev
     - libxss-dev
-    - libxslt-dev
     - libxslt1-dev
-    - libzmq-dev
+    - libzmq3-dev
     - qemu-user-static
     - qemu-utils
     - kpartx
     - python
     - python-setuptools
     - python-dev
-    - python-pip
     - python-libvirt
     - python-virtualenv
     - bridge-utils
@@ -74,3 +72,23 @@
 - name: Remove useless packages from the cache
   apt:
     autoclean: yes
+
+# There is a bug with the easy install ansible module in Ubuntu 16.04 linux.
+# Refer https://github.com/ansible/ansible/issues/23534
+- name: Install pip
+  shell: easy_install -U pip
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_major_version|int <= 16
+
+- name: Install python-pip
+  action: "{{ ansible_pkg_mgr }} name=python-pip state=present"
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_major_version|int >= 17
+
+- name: Install required docker-py module
+  pip:
+    name: docker-py
+    state: latest
+  environment: "{{ proxy_env }}"
diff --git a/ansible/roles/install_dependencies_jumphost/tasks/RedHat.yml b/ansible/roles/install_dependencies_jumphost/tasks/RedHat.yml
index 85eb1156a..cb5315adb 100644
--- a/ansible/roles/install_dependencies_jumphost/tasks/RedHat.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/RedHat.yml
@@ -52,3 +52,4 @@
     - openssl
     - python-virtualenv
     - ccze
+    - python-pip
diff --git a/ansible/roles/install_dependencies_jumphost/tasks/Suse.yml b/ansible/roles/install_dependencies_jumphost/tasks/Suse.yml
index af53c9cd5..7932ed96d 100644
--- a/ansible/roles/install_dependencies_jumphost/tasks/Suse.yml
+++ b/ansible/roles/install_dependencies_jumphost/tasks/Suse.yml
@@ -47,3 +47,9 @@
     - openssl
     - python-virtualenv
     - ccze
+
+# There is a bug with the easy install ansible module in suse linux.
+# Until this is fixed the shell command must be used
+# Refer https://github.com/ansible/ansible/issues/37296
+- name: Install pip
+  shell: easy_install -U pip
-- 
cgit 1.2.3-korg