Install pip on Fedora 22

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/testnode/tasks/pip.yml b/roles/testnode/tasks/pip.yml
index b9473e36ce6089af63e2eade08ff535200c063bf..0b0800dffdf76e21a54103acc0f4b1798ca7bf53 100644 (file)
--- a/roles/testnode/tasks/pip.yml
+++ b/roles/testnode/tasks/pip.yml
@@ -1,16 +1,17 @@
 ---
+# python-pip installed during packages task on Fedora since epel doesn't exist
 - name: Install python-pip on rpm based systems.
   yum:
     name: python-pip
     state: present
     enablerepo: epel
-  when: ansible_pkg_mgr  == "yum"
+  when: ansible_pkg_mgr == "yum" and ansible_distribution != 'Fedora'
 
 - name: Install python-pip on apt based systems.
   apt:
     name: python-pip
     state: present
-  when: ansible_pkg_mgr  == "apt"
+  when: ansible_pkg_mgr == "apt"
 
 - name: Create the .pip directory for the teuthology user.
   file:

diff --git a/roles/testnode/vars/fedora_22.yml b/roles/testnode/vars/fedora_22.yml
index 2f086ea8f714f56af7803f328cc75e15f29c4053..2c911b6fc7e303d9419b88ea46d176aab975669c 100644 (file)
--- a/roles/testnode/vars/fedora_22.yml
+++ b/roles/testnode/vars/fedora_22.yml
@@ -74,3 +74,5 @@ packages:
   - smartmontools
   # for nfs
   - nfs-utils
+  # python-pip is installed via roles/testnode/tasks/pip.yml on other rpm-based distros
+  - python-pip