From 3e35d53061cb65032373ca3c0104cde4720af1f0 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 12 Aug 2014 15:29:19 +1200 Subject: Make removing nodes from scaled items possible. This makes it possible to remove a dead node (e.g. if NovaCompute2 has failed, regenerate the template with ,2 in the scale parameter, and NovaCompute2 will not be enumerated. Change-Id: I65d85a88152ed4adee60895173f8a05611a6440b --- test_merge.bash | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test_merge.bash') diff --git a/test_merge.bash b/test_merge.bash index d076f50a..de29d075 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -36,6 +36,8 @@ run_test "python $merge_py --hot examples/source_include_subkey_hot.yaml" exampl run_test "python $merge_py --hot examples/launchconfig1_hot.yaml examples/launchconfig2_hot.yaml" examples/launchconfig_result_hot.yaml run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale1_hot.yaml" examples/scale_result_hot.yaml run_test "python $merge_py --hot --scale NovaCompute=3 examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml +run_test "python $merge_py --hot --scale NovaCompute=5,1,2 examples/scale_map_hot.yaml" examples/scale_map_result_hot_blacklist.yaml +run_test "python $merge_py --hot --scale NovaCompute=3, examples/scale_map_hot.yaml" examples/scale_map_result_hot.yaml echo trap - EXIT exit $fail -- cgit 1.2.3-korg