openstack/trove
Code Issues Proposed changes

fix the gate: heat-cfntools was yanked out from under us

Browse Source 
I don't know why we even needed heat-cfntools but we appear to have
depended on it. In commit c653eaee1c4091701e8da0f2c6f193e7126d8c49,
this was yanked unceremoniously. So I'm making us no longer reference
it other than the help string in dib's usage (which I won't bother to
fix).

Change-Id: I3cde6b7ba43fdd757a3994d0f3ac6ebec554538c
Caused-By: I221c5a3f82a2500c90646fc69439a210cf64e5e1
Related: I221c5a3f82a2500c90646fc69439a210cf64e5e1
This commit is contained in:
Amrith Kumar 2017-04-16 18:13:10 -04:00 committed by Amrith Kumar
parent 3371343613
commit a97bbad1c3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/dev/building_guest_images.rst
View File

@ -233,7 +233,7 @@ This command will create a guest image usable by Trove:
# run disk-image-create that actually causes the image to be built
${PATH_DISKIMAGEBUILDER}/bin/disk-image-create -a amd64 -o "${VM}" \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm \
cloud-init-datasources ${DISTRO}-guest ${DISTRO}-${SERVICE_TYPE}
-----------------------------
@ -340,7 +340,7 @@ example) Ubuntu guest image for Percona Server with the command line:
.. code-block:: bash
${DIB} -a amd64 -o ${output-file} Ubuntu vm heat-cfntools \
${DIB} -a amd64 -o ${output-file} Ubuntu vm \
cloud-init-datasources ubuntu-guest ubuntu-percona
Where ${DIB} is the fully qualified path to the disk-image-create
@ -563,7 +563,7 @@ build_vm(). We look at this section of code in detail below.
# run disk-image-create that actually causes the image to be built
${PATH_DISKIMAGEBUILDER}/bin/disk-image-create -a amd64 -o "${VM}" \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm \
cloud-init-datasources ${DISTRO}-guest ${DISTRO}-${SERVICE_TYPE}
Several of the environment variables referenced above are referenced
@ -612,7 +612,6 @@ That list of elements is:
${DISTRO}
${EXTRA_ELEMENTS}
vm
heat-cfntools
cloud-init-datasources
${DISTRO}-guest
${DISTRO}-${SERVICE_TYPE}
@ -625,7 +624,6 @@ MySQL. And therefore these would end up being the elements:
ubuntu From diskimage-builder/elements/ubuntu
vm From diskimage-builder/elements/vm
heat-cfntools From tripleo-image-elements/elements/heat-cfntools
cloud-init-datasources From diskimage-builder/elements/cloud-init-datasources
ubuntu-guest From trove/integration/scripts/files/elements/ubuntu-guest
ubuntu-mysql From trove/integration/scripts/files/elements/ubuntu-mysql

2
integration/scripts/functions_qemu
View File

@ -47,7 +47,7 @@ function build_vm() {
export DIB_CLOUD_INIT_ETC_HOSTS=true
local QEMU_IMG_OPTIONS=$(! $(qemu-img | grep -q 'version 1') && echo "--qemu-img-options compat=0.10")
disk-image-create -a amd64 -o "${VM}" \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools \
-x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm \
cloud-init-datasources ${DISTRO}-${RELEASE}-guest ${DISTRO}-${RELEASE}-${SERVICE_TYPE}
}