Move install of python-pip to pip.yml

This makes the pip.conf and .pip directory tasks idempotent.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index ec883bf870cd6299ef60edc1969f7fc5c9665514..de7ff22befc573827a29fb1270a5e64518ba371c 100644 (file)
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -4,9 +4,6 @@
   tags:
     - vars
 
-# configure pip to use our mirror
-- include: pip.yml
-
 - name: Set a high max open files limit for the teuthology user.
   template:
     src: security_limits.conf
@@ -28,3 +25,8 @@
 # configure red hat specific things
 - include: setup-redhat.yml
   when: ansible_os_family == 'RedHat'
+
+# configure pip to use our mirror
+- include: pip.yml
+  tags:
+    - pip

diff --git a/roles/common/tasks/pip.yml b/roles/common/tasks/pip.yml
index 0fe23ab6b3c1d013b5d2a37f8f04d52d0fc03d11..619c66112cb9b8e49400925d12fad1b9a0a42fba 100644 (file)
--- a/roles/common/tasks/pip.yml
+++ b/roles/common/tasks/pip.yml
@@ -1,4 +1,16 @@
 ---
+- name: Install python-pip on rpm based systems.
+  yum:
+    name: python-pip
+    state: present
+  when: ansible_pkg_mgr  == "yum"
+
+- name: Install python-pip on deb based systems.
+  apt:
+    name: python-pip
+    state: present
+  when: ansible_pkg_mgr  == "deb"
+
 - name: Create the .pip directory for the teuthology user.
   file:
     path: "/home/{{ teuthology_user }}/.pip"

diff --git a/roles/common/vars/yum_systems.yml b/roles/common/vars/yum_systems.yml
index 4002ef973e499865eaeacbe0eb7a679eb849bcf8..cfc2c752890bbe81478e5ab466db37582cd1c3db 100644 (file)
--- a/roles/common/vars/yum_systems.yml
+++ b/roles/common/vars/yum_systems.yml
@@ -67,7 +67,6 @@ packages:
   - httpd-tools
   - mod_ssl
   - mod_fastcgi-2.4.7-1.ceph.el7
-  - python-pip
   - libevent-devel
   - perl-JSON-XS
   - perl-XML-Twig