openstack
/
trove-integration
Code Issues Proposed changes

Merge "Fix image-build to set DIB_CLOUD_INIT_DATASOURCES"

This commit is contained in:
Jenkins 2014-06-21 00:43:00 +00:00 committed by Gerrit Code Review
parent 00c87ff617 939e52e904
commit c7da6b43b8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/functions_qemu
View File

@ -38,7 +38,8 @@ function build_vm() {
export GUEST_LOGDIR
export ESCAPED_GUEST_LOGDIR
export ELEMENTS_PATH=$REDSTACK_SCRIPTS/files/elements:$PATH_TRIPLEO_ELEMENTS/elements
${PATH_DISKIMAGEBUILDER}/bin/disk-image-create -a amd64 -o "${VM}" -x ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools ${DISTRO}-guest ${DISTRO}-${SERVICE_TYPE}
export DIB_CLOUD_INIT_DATASOURCES="ConfigDrive"
${PATH_DISKIMAGEBUILDER}/bin/disk-image-create -a amd64 -o "${VM}" -x ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools cloud-init-datasources ${DISTRO}-guest ${DISTRO}-${SERVICE_TYPE}
}
function build_guest_image() {