diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-28 05:00:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-28 05:00:24 +0000 |
| commit | 834b5eff5c1e3768fdc829128cae0b0955420bcd (patch) | |
| tree | 60cf425d8e0b97f766e807abe69452721c92d476 /dev | |
| parent | 90321d0497f14bda370908610cfc44296a940523 (diff) | |
| parent | 0dcb83030dcccd8ad22a26efe2c733d26320b7b4 (diff) | |
| download | kolla-834b5eff5c1e3768fdc829128cae0b0955420bcd.tar.gz kolla-834b5eff5c1e3768fdc829128cae0b0955420bcd.zip | |
Merge "Use packaged pip instead of easy_install"
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/vagrant/bootstrap.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index e365b851e..e7a50e09d 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -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 elif is_ubuntu; then apt-get update - apt-get install -y python-mysqldb python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev - easy_install pip + apt-get install -y python-mysqldb python-pip python-dev build-essential libssl-dev libffi-dev libxml2-dev libxslt-dev else echo "Unsupported Distro: $DISTRO" 1>&2 exit 1 |