From fcbead3871c995f4da423c9fffe9ed444407a5ce Mon Sep 17 00:00:00 2001 From: Roman Podolyaka Date: Fri, 11 Oct 2013 17:54:09 +0300 Subject: 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 --- test_merge.bash | 1 + 1 file changed, 1 insertion(+) (limited to 'test_merge.bash') 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 -- cgit 1.2.3-korg