openstack/trove
Code Issues Proposed changes

Merge "Utilize Ubuntu's hardware enablement stack for trovestack"

Browse Source
This commit is contained in:
Zuul 2017-11-17 02:59:51 +00:00 committed by Gerrit Code Review
commit 5f458ffc38
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
integration/scripts/files/elements/ubuntu-xenial-guest/post-install.d/91-hwe-kernel Normal file
View File

@ -0,0 +1,29 @@
#!/bin/bash
set -e
set -o xtrace
# The HWE stack must be installed for nested virtualization on ppc64el. This
# environment variable is set automatically by trovestack, but it may also be
# set by the user when manually invoking disk-image-create.
case "$DIB_USE_HWE_KERNEL" in
true|True|TRUE|yes|Yes|YES)
DIB_USE_HWE_KERNEL=true
;;
*)
DIB_USE_HWE_KERNEL=false
;;
esac
if [ "$DIB_USE_HWE_KERNEL" == "true" ]; then
export DEBIAN_FRONTEND=noninteractive
PKG_ARCH=$(dpkg --print-architecture)
case "$PKG_ARCH" in
amd64|arm64|ppc64el|s390x)
apt-get --allow-unauthenticated install -y linux-generic-hwe-16.04
;;
esac
fi

7
integration/scripts/functions_qemu
View File

@ -10,6 +10,12 @@
USE_TMPFS=${USE_TMPFS:-true}
# Use the latest distro provided hardware enablement stack which is required
# by some platforms (ppc64el) for nested virtualization. Trovestack runs a
# VM (db guest image) in a VM (OpenStack+Trove)
DIB_USE_HWE_KERNEL=${DIB_USE_HWE_KERNEL:-true}
function build_vm() {
exclaim "Actually building the image, this can take up to 15 minutes"
@ -29,6 +35,7 @@ function build_vm() {
if [ $DISTRO == 'ubuntu' ]; then
export DIB_RELEASE=$RELEASE
export DIB_CLOUD_IMAGES=cloud-images.ubuntu.com
export DIB_USE_HWE_KERNEL
ARCH=$(dpkg --print-architecture)
elif [ $DISTRO == 'fedora' ]; then
EXTRA_ELEMENTS=selinux-permissive