openstack/trove
Code Issues Proposed changes

Merge "Enable other Ubuntu architectures to utilize diskimage-builder"

Browse Source
This commit is contained in:
Zuul 2017-11-14 00:37:46 +00:00 committed by Gerrit Code Review
commit 1434a4ad1a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integration/scripts/functions_qemu
View File

@ -18,11 +18,12 @@ function build_vm() {
readonly SSH_DIR=${KEY_DIR:-${HOMEDIR}/.ssh} readonly SSH_DIR=${KEY_DIR:-${HOMEDIR}/.ssh}
manage_ssh_keys manage_ssh_keys
ARCH=amd64
if [ $DISTRO == 'ubuntu' ]; then if [ $DISTRO == 'ubuntu' ]; then
export DIB_RELEASE=$RELEASE export DIB_RELEASE=$RELEASE
export DIB_CLOUD_IMAGES=cloud-images.ubuntu.com export DIB_CLOUD_IMAGES=cloud-images.ubuntu.com
fi ARCH=$(dpkg --print-architecture)
if [ $DISTRO == 'fedora' ]; then elif [ $DISTRO == 'fedora' ]; then
EXTRA_ELEMENTS=selinux-permissive EXTRA_ELEMENTS=selinux-permissive
fi fi
@ -46,7 +47,7 @@ function build_vm() {
export DIB_APT_CONF_DIR=/etc/apt/apt.conf.d export DIB_APT_CONF_DIR=/etc/apt/apt.conf.d
export DIB_CLOUD_INIT_ETC_HOSTS=true export DIB_CLOUD_INIT_ETC_HOSTS=true
local QEMU_IMG_OPTIONS="--qemu-img-options compat=1.1" local QEMU_IMG_OPTIONS="--qemu-img-options compat=1.1"
disk-image-create -a amd64 -o "${VM}" \ disk-image-create -a ${ARCH} -o "${VM}" \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm \ -x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm \
cloud-init-datasources ${DISTRO}-${RELEASE}-guest ${DISTRO}-${RELEASE}-${SERVICE_TYPE} cloud-init-datasources ${DISTRO}-${RELEASE}-guest ${DISTRO}-${RELEASE}-${SERVICE_TYPE}
} }