...
|
...
|
@@ -10,6 +10,7 @@
|
10
|
10
|
# Dependencies:
|
11
|
11
|
#
|
12
|
12
|
# - functions
|
|
13
|
+# - dib (if HEAT_CREATE_TEST_IMAGE=True)
|
13
|
14
|
|
14
|
15
|
# stack.sh
|
15
|
16
|
# ---------
|
...
|
...
|
@@ -301,19 +302,25 @@ function create_heat_accounts {
|
301
|
301
|
|
302
|
302
|
# build_heat_functional_test_image() - Build and upload functional test image
|
303
|
303
|
function build_heat_functional_test_image {
|
304
|
|
- build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
|
305
|
|
- local image_name=heat-functional-tests-image
|
306
|
|
-
|
307
|
|
- # The elements to invoke disk-image-create with
|
308
|
|
- local image_elements="vm fedora selinux-permissive pypi \
|
309
|
|
- os-collect-config os-refresh-config os-apply-config heat-cfntools \
|
310
|
|
- heat-config heat-config-cfn-init heat-config-puppet heat-config-script"
|
311
|
|
-
|
312
|
|
- # Elements path for tripleo-image-elements and heat-templates software-config
|
313
|
|
- local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements
|
314
|
|
-
|
315
|
|
- disk_image_create_upload "$image_name" "$image_elements" "$elements_path"
|
316
|
|
- iniset $TEMPEST_CONFIG orchestration image_ref $image_name
|
|
304
|
+ if is_service_enabled dib; then
|
|
305
|
+ build_dib_pip_repo "$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
|
|
306
|
+ local image_name=heat-functional-tests-image
|
|
307
|
+
|
|
308
|
+ # The elements to invoke disk-image-create with
|
|
309
|
+ local image_elements="vm fedora selinux-permissive pypi \
|
|
310
|
+ os-collect-config os-refresh-config os-apply-config heat-cfntools \
|
|
311
|
+ heat-config heat-config-cfn-init heat-config-puppet heat-config-script"
|
|
312
|
+
|
|
313
|
+ # Elements path for tripleo-image-elements and heat-templates software-config
|
|
314
|
+ local elements_path=$TIE_DIR/elements:$HEAT_TEMPLATES_REPO_DIR/hot/software-config/elements
|
|
315
|
+
|
|
316
|
+ disk_image_create_upload "$image_name" "$image_elements" "$elements_path"
|
|
317
|
+ iniset $TEMPEST_CONFIG orchestration image_ref $image_name
|
|
318
|
+ else
|
|
319
|
+ echo "Error, HEAT_CREATE_TEST_IMAGE=True requires dib" >&2
|
|
320
|
+ echo "Add \"enable_service dib\" to your localrc" >&2
|
|
321
|
+ exit 1
|
|
322
|
+ fi
|
317
|
323
|
}
|
318
|
324
|
|
319
|
325
|
# Restore xtrace
|