From d2d08fb2cc042141d2bf60bcf65a7b9a2e93044d Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 11 Jun 2015 15:19:00 -0400
Subject: [PATCH] Change pip install method and add six to requirements

Minor changes to make Bifrost's test/installation sequence more
compatible with Centos7.  Attempt easy_install based install
for pip if it is missing and install six from pypi as it
is required by Ansible.

Change-Id: Ia583bcaa15239753b7f50afbae001aff0904efd3
Partial-Bug: 1463871
---
 requirements.txt     | 1 +
 scripts/env-setup.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index b4d94ee65..02c103d35 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 oslo.config>=1.11.0
 oslo.log>=1.2.0
+six>=1.9.0
diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index 83116c155..c1cfb95d8 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -6,7 +6,7 @@ if [ -x '/usr/bin/apt-get' ]; then
         sudo -H apt-get -y install git
     fi
     if ! $(pip -v &>/dev/null); then
-        sudo -H apt-get -y install python-pip
+        sudo easy_install pip
     fi
 elif [ -x '/usr/bin/yum' ]; then
     if ! $(git --version &>/dev/null); then