openstack/devstack
Code Issues Proposed changes

Merge "Make use of Ubuntu Cloud Archive switchable"

Browse Source
This commit is contained in:
Jenkins 2017-06-09 01:55:36 +00:00 committed by Gerrit Code Review
commit 9234316794
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stackrc
View File

@ -655,6 +655,8 @@ case "$VIRT_DRIVER" in
;; ;;
esac esac
# By default, devstack will use Ubuntu Cloud Archive.
ENABLE_UBUNTU_CLOUD_ARCHIVE=$(trueorfalse True ENABLE_UBUNTU_CLOUD_ARCHIVE)
# Images # Images
# ------ # ------

5
tools/fixup_stuff.sh
View File

@ -72,7 +72,10 @@ fi
# 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.
if [[ "$DISTRO" = "xenial" ]]; then # 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
# is required for the trove development environment.
if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "True" && "$DISTRO" = "xenial" ]]; then
# This pulls in apt-add-repository # This pulls in apt-add-repository
install_package "software-properties-common" install_package "software-properties-common"
# Use UCA for newer libvirt. Should give us libvirt 2.5.0. # Use UCA for newer libvirt. Should give us libvirt 2.5.0.