openstack/devstack
Code Issues Proposed changes

Merge "Enable universe repository on Ubuntu"

Browse Source
This commit is contained in:
Zuul 2019-07-03 16:38:21 +00:00 committed by Gerrit Code Review
commit 9ee5347e69
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/fixup_stuff.sh
View File

@ -69,21 +69,29 @@ function fixup_keystone {
fi fi
} }
# Ubuntu Cloud Archive # Ubuntu Repositories
#--------------------- #--------------------
# We've found that Libvirt on Xenial is flaky and crashes enough to be # We've found that Libvirt on Xenial is flaky and crashes enough to be
# a regular top e-r bug. Opt into Ubuntu Cloud Archive if on Xenial to # a regular top e-r bug. Opt into Ubuntu Cloud Archive if on Xenial to
# get newer Libvirt. # get newer Libvirt.
# Make it possible to switch this based on an environment variable as # Make it possible to switch this based on an environment variable as
# libvirt 2.5.0 doesn't handle nested virtualization quite well and this # libvirt 2.5.0 doesn't handle nested virtualization quite well and this
# is required for the trove development environment. # is required for the trove development environment.
function fixup_uca { # Also enable universe since it is missing when installing from ISO.
if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "False" || "$DISTRO" != "xenial" ]]; then function fixup_ubuntu {
if [[ "$DISTRO" != "xenial" && "$DISTRO" != "bionic" ]]; then
return return
fi fi
# This pulls in apt-add-repository # This pulls in apt-add-repository
install_package "software-properties-common" install_package "software-properties-common"
# Enable universe
sudo add-apt-repository -y universe
if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "False" || "$DISTRO" != "xenial" ]]; then
return
fi
# Use UCA for newer libvirt. # Use UCA for newer libvirt.
if [[ -f /etc/ci/mirror_info.sh ]] ; then if [[ -f /etc/ci/mirror_info.sh ]] ; then
# If we are on a nodepool provided host and it has told us about where # If we are on a nodepool provided host and it has told us about where
@ -269,7 +277,7 @@ function fixup_virtualenv {
function fixup_all { function fixup_all {
fixup_keystone fixup_keystone
fixup_uca fixup_ubuntu
fixup_python_packages fixup_python_packages
fixup_fedora fixup_fedora
fixup_suse fixup_suse