openstack
/
openstack-ansible-ops
Code Issues Proposed changes

Fix venv building for new tags 

more headers were needed, also, revert the kilo release change.
eol-kilo has swift in upper-constraints, which causes problems for venv
building, it was removed from future releases for this exactly this
reason.

Change-Id: I1f8c8ea4681ab63dd67851235f405d1cbd478eae
This commit is contained in:
Matthew Thode 2017-08-21 20:06:46 -05:00
parent 3eafd56664
commit 1fd0f80b1b
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
leap-upgrades/lib/functions.sh
View File

@ -428,7 +428,7 @@ function build_venv {
fi
# install ldap and sasl headers for pyldap (or ldap-python)
apt-get -y install libldap2-dev libsasl2-dev
apt-get -y install libldap2-dev libsasl2-dev libxml2-dev libxslt1-dev
### The venv build is done using a modern version of the py_pkgs plugin which collects all versions of
### the OpenStack components from a given release. This creates 1 large venv per migratory release.

2
leap-upgrades/lib/vars.sh
View File

@ -20,7 +20,7 @@ export DEBUG_PATH="${DEBUG_PATH:-/tmp/run_debug}"
## Script Vars ---------------------------------------------------------------
export JUNO_RELEASE="${JUNO_RELEASE:-eol-juno}"
export KILO_RELEASE="${KILO_RELEASE:-eol-kilo}"
export KILO_RELEASE="${KILO_RELEASE:-11.2.17}" # eol-kilo has swift in upper-constraints, preventing venv building
export LIBERTY_RELEASE="${LIBERTY_RELEASE:-liberty-eol}"
export MITAKA_RELEASE="${MITAKA_RELEASE:-mitaka-eol}"
export NEWTON_RELEASE="${NEWTON_RELEASE:-14.2.7}"