diff options
author | Robert Collins <rbtcollins@hp.com> | 2014-02-20 17:14:43 +1300 |
---|---|---|
committer | Robert Collins <rbtcollins@hp.com> | 2014-02-21 11:13:10 +1300 |
commit | 70494ab2cb75e7f7ca83a169eac823b22eb6e180 (patch) | |
tree | a39f0002c980c07f8b5b283bde414d2720f8a95e /test_merge.bash | |
parent | 8403b8ae9fd7eef452fe7cd96df814e195fea916 (diff) |
Add a Merge::Map feature.
We need to scatter gather in a few situations - determining rabbit
cluster membership, galera membership and configuring hosts for Nova
to permit live migration (which requires host->host communication).
This patch is a proof of concept for an eventual heat feature,
expressed in merge.py. The example given should work for actual use,
but I'll deliver that change separately.
Change-Id: I68e9b2471866810cc698ca3ea28ddf5bb1688d7b
Diffstat (limited to 'test_merge.bash')
-rwxr-xr-x | test_merge.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test_merge.bash b/test_merge.bash index f9bc7fb6..19d75377 100755 --- a/test_merge.bash +++ b/test_merge.bash @@ -29,6 +29,7 @@ run_test "python $merge_py examples/source2.yaml" examples/source2_lib_result.ya 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 |