From c071255ad6bf1fb2c9db6799e96b509295f53fc9 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 28 Jan 2014 19:20:40 +1300 Subject: Make scaling out a feature for merge.py. This is a simple implementation designed to work with our current non-HOT approach. We need to adjust our templates a little to support this - though future work could make that better, it's orthogonal to this effort. Change-Id: I555617e5f24a5882de915f057dc02e008c81e753 --- 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 61462f66..f9bc7fb6 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -28,6 +28,7 @@ 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 echo trap - EXIT exit $fail -- cgit 1.2.3-korg