openstack/openstack-ansible-ops
Code Issues Proposed changes

Ensure liberasurecode-dev is installable

Browse Source 
Make sure the liberasurecode-dev is installable when needed, in order
to build the venvs for swift.
No distinction is done anymore for backports/anything else like UCA.

Change-Id: I552b77eeb05469b815592da1dd7fab45124ffe89
This commit is contained in:
Jean-Philippe Evrard 2017-07-03 15:00:52 +01:00
parent 8d92f0515b
commit da7cc439f7
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,12 +262,6 @@ function pre_flight {
exit 99 exit 99
fi fi
# Install liberasurecode-dev which will be used in the venv creation process
if ! grep -n ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -qw "backports"; then
failure "The trusty backports repo has not been enabled on this host."
exit 99
fi
if [[ ! -f /opt/leap42/rebootstrap-ansible ]]; then if [[ ! -f /opt/leap42/rebootstrap-ansible ]]; then
# Don't run this over and over again if the variables above are not set! # Don't run this over and over again if the variables above are not set!
pushd /opt/leap42 pushd /opt/leap42
@ -276,9 +270,6 @@ function pre_flight {
chmod +x py_pkgs.py chmod +x py_pkgs.py
popd popd
apt-get update > /dev/null
apt-get -y install liberasurecode-dev > /dev/null
# Upgrade pip if it's needed. This will re-install pip using the constraints and then # Upgrade pip if it's needed. This will re-install pip using the constraints and then
# re-install all of the remaining requirements as needed. # re-install all of the remaining requirements as needed.
if dpkg --compare-versions "$(pip --version | awk '{print $2}')" "lt" "9.0.1"; then if dpkg --compare-versions "$(pip --version | awk '{print $2}')" "lt" "9.0.1"; then
@ -381,6 +372,18 @@ function run_venv_prep {
} }
function build_venv { function build_venv {
# Building venv requires to be able to install liberasurecode-dev for swift.
# It should be found in backports or UCA.
apt-get update > /dev/null
# Install liberasurecode-dev which will be used in the venv creation process
if ! apt-cache search liberasurecode-dev | grep liberasurecode-dev; then
failure "Can't install liberasurecode-dev. Enable trusty backports or UCA on this host."
exit 99
fi
apt-get -y install liberasurecode-dev > /dev/null
### The venv build is done using a modern version of the py_pkgs plugin which collects all versions of ### 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. ### the OpenStack components from a given release. This creates 1 large venv per migratory release.
# If the venv archive exists delete it. # If the venv archive exists delete it.