aboutsummaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorRoman Podolyaka <rpodolyaka@mirantis.com>2013-10-11 17:54:09 +0300
committerRoman Podolyaka <rpodolyaka@mirantis.com>2013-10-14 15:30:24 +0300
commitfcbead3871c995f4da423c9fffe9ed444407a5ce (patch)
tree0b6a1222459f541a5ac6671831bd07f7db52ff46 /test_merge.bash
parent8e36320284dc2cce39a521d1723082dd75f94f39 (diff)
Make LaunchConfiguration resources mergeable
This can be very useful for merging of Metadata to be used by optional services (e. g. to add services like tuskar to undercloud on demand). Change-Id: Ifc4016d6e994064c0772c12e668e98bf055fada9
Diffstat (limited to 'test_merge.bash')
-rwxr-xr-xtest_merge.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash
index 0eeb2262..e6bfb192 100755
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -26,6 +26,7 @@ echo
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
echo
trap - EXIT
exit $fail