openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix Merge::Map for scatter-gather in Configs."

Browse Source
This commit is contained in:
Jenkins 2014-03-06 01:45:46 +00:00 committed by Gerrit Code Review
commit c12483397c
2 changed files with 138 additions and 1 deletions
examples
scale_map_result.yaml
tripleo_heat_merge
merge.py

132
examples/scale_map_result.yaml

@ -66,6 +66,50 @@ Resources:
- NovaCompute0
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute1
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute1
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute1
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute2
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute2
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute2
- show
- local
os-collect-config:
cfn:
access_key_id:
@ -120,6 +164,28 @@ Resources:
'
- - Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute0
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute0
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute0
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0
@ -141,6 +207,28 @@ Resources:
- NovaCompute1
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute2
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute2
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute2
- show
- local
os-collect-config:
cfn:
access_key_id:
@ -195,6 +283,50 @@ Resources:
'
- - Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute0
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute0
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute0
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0
- Fn::Select:
- ctlplane
- Fn::GetAtt:
- NovaCompute1
- networks
- Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute1
- show
- Fn::Join:
- .
- - Fn::Select:
- name
- Fn::GetAtt:
- NovaCompute1
- show
- local
- Fn::Join:
- ' '
- - Fn::Select:
- 0

7
tripleo_heat_merge/merge.py

@ -33,9 +33,12 @@ def apply_scaling(template, scaling, in_copies=None):
Values are handled via scale_value.
Keys in dicts are always copied per the scaling rule.
Keys in dicts are copied per the scaling rule.
Values are either replaced or copied depending on whether the given
scaling rule is in in_copies.
in_copies is reset to None when a dict {'Merge::Map': someobject} is
encountered.
"""
in_copies = dict(in_copies or {})
# Shouldn't be needed but to avoid unexpected side effects/bugs we short
@ -43,6 +46,8 @@ def apply_scaling(template, scaling, in_copies=None):
if not scaling:
return template
if isinstance(template, dict):
if 'Merge::Map' in template:
in_copies = None
new_template = {}
for key, value in template.items():
for prefix, copy_num, new_key in scale_value(