openstack/devstack
Code Issues Proposed changes

Merge "Make elements for heat test image configurable"

Browse Source
This commit is contained in:
Jenkins 2015-01-29 05:56:38 +00:00 committed by Gerrit Code Review
commit d31b05cc7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/heat
View File

@ -47,6 +47,11 @@ HEAT_TEMPLATES_DIR=$HEAT_CONF_DIR/templates
HEAT_STACK_DOMAIN=$(trueorfalse True HEAT_STACK_DOMAIN) HEAT_STACK_DOMAIN=$(trueorfalse True HEAT_STACK_DOMAIN)
HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP} HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
HEAT_API_PORT=${HEAT_API_PORT:-8004} HEAT_API_PORT=${HEAT_API_PORT:-8004}
HEAT_FUNCTIONAL_IMAGE_ELEMENTS=${HEAT_FUNCTIONAL_IMAGE_ELEMENTS:-\
vm fedora selinux-permissive pypi os-collect-config os-refresh-config \
os-apply-config heat-cfntools heat-config heat-config-cfn-init \
heat-config-puppet heat-config-script}
# other default options # other default options
HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts} HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts}
@ -306,15 +311,10 @@ function build_heat_functional_test_image {
build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR" build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
local image_name=heat-functional-tests-image local image_name=heat-functional-tests-image
# The elements to invoke disk-image-create with
local image_elements="vm fedora selinux-permissive pypi \
os-collect-config os-refresh-config os-apply-config heat-cfntools \
heat-config heat-config-cfn-init heat-config-puppet heat-config-script"
# Elements path for tripleo-image-elements and heat-templates software-config # Elements path for tripleo-image-elements and heat-templates software-config
local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements
disk_image_create_upload "$image_name" "$image_elements" "$elements_path" disk_image_create_upload "$image_name" "$HEAT_FUNCTIONAL_IMAGE_ELEMENTS" "$elements_path"
iniset $TEMPEST_CONFIG orchestration image_ref $image_name iniset $TEMPEST_CONFIG orchestration image_ref $image_name
else else
echo "Error, HEAT_CREATE_TEST_IMAGE=True requires dib" >&2 echo "Error, HEAT_CREATE_TEST_IMAGE=True requires dib" >&2