Increase PXE deployment timeout for overcloud

[apex-tripleo-heat-templates.git] / test_merge.bash

diff --git a/test_merge.bash b/test_merge.bash
index 61462f6..19d7537 100755 (executable)
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -28,6 +28,8 @@ run_test "python $merge_py examples/source.yaml" examples/source_lib_result.yaml
 run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.yaml
 run_test "python $merge_py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml
 run_test "python $merge_py examples/launchconfig1.yaml examples/launchconfig2.yaml" examples/launchconfig_result.yaml
+run_test "python $merge_py --scale NovaCompute=3 examples/scale1.yaml" examples/scale_result.yaml
+run_test "python $merge_py --scale NovaCompute=3 examples/scale_map.yaml" examples/scale_map_result.yaml
 echo
 trap - EXIT
 exit $fail