openstack/devstack
Code Issues Proposed changes

Merge "Check dib is available before building heat test image"

Browse Source
This commit is contained in:
Jenkins 2015-01-29 05:56:30 +00:00 committed by Gerrit Code Review
commit 61cb01a8a2
1 changed files with 17 additions and 10 deletions

27
lib/heat

@ -10,6 +10,7 @@
# Dependencies:
#
# - functions
# - dib (if HEAT_CREATE_TEST_IMAGE=True)
# stack.sh
# ---------
@ -301,19 +302,25 @@ function create_heat_accounts {
# build_heat_functional_test_image() - Build and upload functional test image
function build_heat_functional_test_image {
build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
local image_name=heat-functional-tests-image
if is_service_enabled dib; then
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"
# 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
# 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"
iniset $TEMPEST_CONFIG orchestration image_ref $image_name
disk_image_create_upload "$image_name" "$image_elements" "$elements_path"
iniset $TEMPEST_CONFIG orchestration image_ref $image_name
else
echo "Error, HEAT_CREATE_TEST_IMAGE=True requires dib" >&2
echo "Add \"enable_service dib\" to your localrc" >&2
exit 1
fi
}
# Restore xtrace