Fix Merge::Map for scatter-gather in Configs.
authorRobert Collins <rbtcollins@hp.com>
Wed, 5 Mar 2014 22:01:50 +0000 (11:01 +1300)
committerRobert Collins <rbtcollins@hp.com>
Wed, 5 Mar 2014 23:38:34 +0000 (12:38 +1300)
commit1879dc0800e8015e201f4698c1214a0e525f7ee3
tree0fec6571ac973db57a088293a28d0d8cf93e6a3a
parent9df35c186f14d3b3b76a3946981ad6ec5cf9336f
Fix Merge::Map for scatter-gather in Configs.

When Merge::Map was used like so:

NovaCompute0Config:
  Merge::Map:
    NovaCompute0:
      Fn:....

We were adjusting the inner NovaCompute0 to the current scaling loop
position rather than exploding it out as part of the map. For now, we
want maps to be global in context so the fix is fortunately simple.

Change-Id: Ibea723d4c763f593d934a9d2acfd31ce369f6408
examples/scale_map_result.yaml
tripleo_heat_merge/merge.py