Use upper constraints when installing ARA

Currently the installation of ARA does not apply
the same pip options (including constraints, proxy
settings, etc) as the ansible bootstrap. This may
result in unexpected side-effects.

To ensure that we're keeping things consistent, we
apply the same pip options as those used for the
Ansible bootstrap.

Backport note:
We include the os_rally role requirement to ensure
that the repo build is able to complete.

Depends-On: https://review.openstack.org/570929
Change-Id: I5f20a130032e1b65dc78828344345515975da4dc
(cherry picked from commit f4e8e7f82a)
This commit is contained in:
Jesse Pretorius 2018-05-29 12:42:30 +01:00
parent 56099d7911
commit 5c341a7bad
3 changed files with 14 additions and 3 deletions

View File

@ -117,7 +117,7 @@
- name: os_rally
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_rally
version: 0289542a29f4705a6e16c69d19a2d1718d85cf22
version: 37f48c1e029b82dabd86e72ce4497e41d186a679
- name: os_sahara
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_sahara

View File

@ -0,0 +1,7 @@
---
issues:
- |
All OSA releases earlier than 17.0.5, 16.0.4, and 15.1.22 will fail to build the
rally venv due to the release of the new cmd2-0.9.0 python library. Deployers are
encouraged to update to the latest OSA release which pins to an appropriate version
which is compatible with python2.

View File

@ -111,10 +111,14 @@ source "${OSA_CLONE_DIR}/scripts/bootstrap-ansible.sh"
ARA_SRC_HOME="${HOME}/src/git.openstack.org/openstack/ara"
if [[ -d "${ARA_SRC_HOME}" ]]; then
# This installs from a git checkout
/opt/ansible-runtime/bin/pip install ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
# PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
# PIP_OPTS contains the whole set of constraints that need to be applied.
${PIP_COMMAND} install ${PIP_OPTS} ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
else
# This installs from pypi
/opt/ansible-runtime/bin/pip install ara==0.14.0 "${ANSIBLE_PACKAGE:-ansible}"
# PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
# PIP_OPTS contains the whole set of constraints that need to be applied.
${PIP_COMMAND} install ${PIP_OPTS} ara==0.14.0 "${ANSIBLE_PACKAGE:-ansible}"
fi
# Dynamically retrieve the location of the ARA callback so we are able to find
# it on both py2 and py3