From: David Galloway <dgallowa@redhat.com>
Date: Tue, 16 Feb 2016 20:47:33 +0000 (-0500)
Subject: Install pip on Fedora 22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e3d5ddeac456113537fa29b4e79be876d48d001;p=ceph-cm-ansible.git

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 b9473e36..0b0800df 100644
--- 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 2f086ea8..2c911b6f 100644
--- 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