Skip to content

Commit bb436d3

Browse files
committed
Make use of Ubuntu Cloud Archive switchable
The trove development environment is typically a linux VM within which openstack is installed, and trove launches guest vm's within that environment. To make it possible for these vm's to launch in one human lifetime, one must set vt/x and enable nested hypervisors to use with kvm; qemu emulation will take way too long. The new libvirtd (v2.5.0) in Ubuntu Cloud Archive doesn't handle nested hypervisors well and if you use it, you end up with a guest hanging on the GRUB line. To enable that use-case, we provide ENABLE_UBUNTU_CLOUD_ARCHIVE which the trove developer can set (to False) before running devstack. Change-Id: Ia0265c67bb7d2a438575a03c0ddbf2d9c53266ed Closes-Bug: #1689370
1 parent 27df725 commit bb436d3

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

stackrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,8 @@ case "$VIRT_DRIVER" in
665665
;;
666666
esac
667667

668+
# By default, devstack will use Ubuntu Cloud Archive.
669+
ENABLE_UBUNTU_CLOUD_ARCHIVE=$(trueorfalse True ENABLE_UBUNTU_CLOUD_ARCHIVE)
668670

669671
# Images
670672
# ------

tools/fixup_stuff.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ fi
7272
# We've found that Libvirt on Xenial is flaky and crashes enough to be
7373
# a regular top e-r bug. Opt into Ubuntu Cloud Archive if on Xenial to
7474
# get newer Libvirt.
75-
if [[ "$DISTRO" = "xenial" ]]; then
75+
# Make it possible to switch this based on an environment variable as
76+
# libvirt 2.5.0 doesn't handle nested virtualization quite well and this
77+
# is required for the trove development environment.
78+
if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "True" && "$DISTRO" = "xenial" ]]; then
7679
# This pulls in apt-add-repository
7780
install_package "software-properties-common"
7881
# Use UCA for newer libvirt. Should give us libvirt 2.5.0.

0 commit comments

Comments
 (0)