openstack/project-config
Code Issues Proposed changes

Stop supplying DIB_RELEASE

Browse Source 
dib already picks DIB_RELEASE out of the env, and us setting a default
subverts its ability to do the right thing in elements. Similarly,
the DIB_IMAGE_NAME is both not a dib env var and was not being used, nor
was DIB_IMAGE_FILENAME.

Change-Id: I0522bad3a4be6d81d225fec37a08c7c71a65fe4d
This commit is contained in:
Monty Taylor 2014-10-07 10:16:27 -07:00
parent 45f565a49d
commit 81291bd00c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build-image.sh
View File

@ -18,11 +18,10 @@ set -e
export ELEMENTS_PATH=${ELEMENTS_PATH:-nodepool/elements}
export DISTRO=${DISTRO:-ubuntu}
export DIB_RELEASE=${DIB_RELEASE:-trusty}
export DIB_IMAGE_NAME=${DIB_IMAGE_NAME:-${DISTRO}_${DIB_RELEASE}}
export DIB_IMAGE_FILENAME=${DIB_IMAGE_FILENAME:-${DIB_IMAGE_NAME}.qcow}
export IMAGE_NAME=${IMAGE_NAME:-devstack-gate}
export NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-nodepool/scripts}
export CONFIG_SOURCE=${CONFIG_SOURCE:-https://git.openstack.org/openstack-infra/config}
export CONFIG_REF=${CONFIG_REF:-master}
disk-image-create -x --no-tmpfs -o devstack-gate-$DIB_RELEASE $DISTRO vm openstack-repos puppet nodepool-base node-devstack
disk-image-create -x --no-tmpfs -o $IMAGE_NAME $DISTRO \
vm openstack-repos puppet nodepool-base node-devstack