Stop hard-coding the OpenStack PyPI mirror.

os-svc-install doesn't need to hard-code the OpenStack PyPI mirror :
doing so prevents the pypi element from fully benefiting image builds,
and the pypi-openstack element can select the OpenStack PyPI mirror
when that is needed.

Change-Id: Ibc73d11d776c89cf1b4ff12cdcd5b8d8b76a176d
This commit is contained in:
Robert Collins 2013-09-08 15:19:58 +12:00
parent 5f7825ab1b
commit 21c900e95d
1 changed files with 2 additions and 8 deletions

View File

@ -1,12 +1,6 @@
#!/bin/bash
set -eux
# Use the pypi mirror, it's reliable and all openstack svc's have their
# dependencies in it.
pypi_mirror=http://pypi.openstack.org/openstack/
pip_install="pip install -i $pypi_mirror "
function python-install() {
local name=$1
local svc_root=$2
@ -39,12 +33,12 @@ function python-install() {
pip install -U 'setuptools>=1.0'
if [ -n "$reqs" ] ; then
$pip_install -r $reqs
pip install -r $reqs
# FIXME: pip requires doesn't include MySQL-python
pip install MySQL-python
fi
$pip_install $svc_root
pip install $svc_root
set +u
deactivate