openstack/bifrost
Code Issues Proposed changes

Change pip install method and add six to requirements

Browse Source 
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
This commit is contained in:
Julia Kreger 2015-06-11 15:19:00 -04:00
parent e05809c07e
commit d2d08fb2cc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -5,3 +5,4 @@ pbr>=0.6,!=0.7,<1.0
Babel>=1.3 Babel>=1.3
oslo.config>=1.11.0 oslo.config>=1.11.0
oslo.log>=1.2.0 oslo.log>=1.2.0
six>=1.9.0

2
scripts/env-setup.sh
View File

@ -6,7 +6,7 @@ if [ -x '/usr/bin/apt-get' ]; then
sudo -H apt-get -y install git sudo -H apt-get -y install git
fi fi
if ! $(pip -v &>/dev/null); then if ! $(pip -v &>/dev/null); then
sudo -H apt-get -y install python-pip sudo easy_install pip
fi fi
elif [ -x '/usr/bin/yum' ]; then elif [ -x '/usr/bin/yum' ]; then
if ! $(git --version &>/dev/null); then if ! $(git --version &>/dev/null); then