openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use packaged pip instead of easy_install"

Browse Source
This commit is contained in:
Jenkins 2016-03-28 05:00:24 +00:00 committed by Gerrit Code Review
commit 834b5eff5c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/vagrant/bootstrap.sh
View File

@ -70,8 +70,7 @@ function prep_work {
yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel
elif is_ubuntu; then elif is_ubuntu; then
apt-get update apt-get update
apt-get install -y python-mysqldb python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev apt-get install -y python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev
easy_install pip
else else
echo "Unsupported Distro: $DISTRO" 1>&2 echo "Unsupported Distro: $DISTRO" 1>&2
exit 1 exit 1