Make elements for heat test image configurable
Allow the elements built into the heat functional test image to
be overridden via the localrc, allows easier testing of local
images with different/additional elements.
Change-Id: Ibaf2322e0572d25461579bbb2dc8a18858f4e09c
diff --git a/lib/heat b/lib/heat
index c9a3f7e..ed5d834 100644
--- a/lib/heat
+++ b/lib/heat
@@ -47,6 +47,11 @@
HEAT_STACK_DOMAIN=$(trueorfalse True HEAT_STACK_DOMAIN)
HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
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
HEAT_DEFERRED_AUTH=${HEAT_DEFERRED_AUTH:-trusts}
@@ -295,15 +300,10 @@
build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
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
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
else
echo "Error, HEAT_CREATE_TEST_IMAGE=True requires dib" >&2