openstack/openstack-ansible
Code Issues Proposed changes

Remove double-quotes from $PIP_INSTALL_OPTIONS

Browse Source 
Currently, bootstrap-ansible.sh fails to run as $PIP_INSTALL_OPTIONS is
surrounded by quotations which get-pip.py does not like.  This commit
simply removes those so get-pip.py will install pinned packages
correctly.

This was not caught in the gate check as the gate image already has
pip installed. This bug would only be encountered on a fresh build
without pip installed.

Change-Id: I9b9033a065c8b878ac129b8d4b99f3d6874fd6ff
This commit is contained in:
Jesse Pretorius 2016-03-03 10:36:35 +00:00 committed by Matt Thompson
parent 46c1b53e52
commit 92a8550fc8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/scripts-library.sh
View File

@ -226,7 +226,7 @@ function get_pip {
if [ -n "${GET_PIP_URL:-}" ]; then
curl --silent ${GET_PIP_URL} > /opt/get-pip.py
if head -n 1 /opt/get-pip.py | grep python; then
python /opt/get-pip.py "${PIP_INSTALL_OPTIONS}"
python /opt/get-pip.py ${PIP_INSTALL_OPTIONS}
return
fi
fi
@ -234,14 +234,14 @@ function get_pip {
# Try getting pip from bootstrap.pypa.io as a primary source
curl --silent https://bootstrap.pypa.io/get-pip.py > /opt/get-pip.py
if head -n 1 /opt/get-pip.py | grep python; then
python /opt/get-pip.py "${PIP_INSTALL_OPTIONS}"
python /opt/get-pip.py ${PIP_INSTALL_OPTIONS}
return
fi
# Try the get-pip.py from the github repository as a primary source
curl --silent https://raw.githubusercontent.com/pypa/get-pip/master/get-pip.py > /opt/get-pip.py
if head -n 1 /opt/get-pip.py | grep python; then
python /opt/get-pip.py "${PIP_INSTALL_OPTIONS}"
python /opt/get-pip.py ${PIP_INSTALL_OPTIONS}
return
fi