openstack/openstack-ansible
Code Issues Proposed changes

Fix wrong version of pip used in bootstrap

Browse Source 
The bootstrap-ansible script is failing with a Python backtrace as it
fails to parse the "ndg-httpsclient>=0.4.2;python_version<'3.0'" line in
requirements.txt properly.

Commit c904de2db5 "Isolate Ansible from the deployment host"
introduced the separation of Ansible into a virtualenv. Even though pip
is updated and placed under /usr/local/bin, the system's package is the
version which is copied into the virtualenv (version 1.5.4 in Ubuntu
14.04).

Commit ab887ee13d "Include python requirements to resolve SNI issue
for Ansible venv" introduced a python_version environment marker to the
ndg-httpsclient line in requirements.txt file. This is a feature which
was added in pip version 6.0 and is therefore not supported by the older
version being run in the virtualenv.

This patch uses the system's version of pip which is installed into the
virtualenv, to update itself to the latest version. This way we can
ensure that we are using the correct version of pip which supports
environment markers and other newer features.

Change-Id: I96536b390ab5bde27397d1ff5de6c16332570e65
This commit is contained in:
Chris Smart
2016-08-22 22:04:02 +10:00
parent 2f9966b07a
commit 07123ebeaa
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/bootstrap-ansible.sh
View File

@@ -84,20 +84,22 @@ elif [ -n "$HTTP_PROXY" ]; then
PIP_OPTS="--proxy $HTTP_PROXY"
fi
PIP_COMMAND=pip2
if [ ! $(which "$PIP_COMMAND") ]; then
PIP_COMMAND=pip
fi
# Create a Virtualenv for the Ansible runtime
PYTHON_EXEC_PATH="$(which python2 || which python)"
virtualenv --always-copy --system-site-packages --python="${PYTHON_EXEC_PATH}" /opt/ansible-runtime
virtualenv --clear --always-copy --system-site-packages --python="${PYTHON_EXEC_PATH}" /opt/ansible-runtime
# Install ansible
PIP_OPTS+=" --upgrade"
PIP_COMMAND="/opt/ansible-runtime/bin/pip"
# When upgrading there will already be a pip.conf file locking pip down to the repo server, in such cases it may be
# necessary to use --isolated because the repo server does not meet the specified requirements.
# When upgrading there will already be a pip.conf file locking pip down to the
# repo server, in such cases it may be necessary to use --isolated because the
# repo server does not meet the specified requirements.
# Ensure we are running the required versions of pip, wheel and setuptools
${PIP_COMMAND} install ${PIP_OPTS} ${PIP_INSTALL_OPTIONS} || ${PIP_COMMAND} install ${PIP_OPTS} --isolated ${PIP_INSTALL_OPTIONS}
# Install the required packages for ansible
$PIP_COMMAND install $PIP_OPTS -r requirements.txt ${ANSIBLE_PACKAGE} || $PIP_COMMAND install --isolated $PIP_OPTS -r requirements.txt ${ANSIBLE_PACKAGE}
# Link the venv installation of Ansible to the local path