openstack/tripleo-heat-templates
Code Issues Proposed changes

Fixed merge code populating properties from yaml.

Browse Source 
Fixed merge code populating properties from yaml files which was
setting only Type attribute for certain attribues related to Image
For example, default value for notcomputeImage is populated properly
in overcloud.yaml

Fixes bug #1202884

Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721
This commit is contained in:
divakar-padiyar-nandavar 2013-08-08 07:57:43 -06:00
parent 94eb778d71
commit 61a0528543
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge.py
View File

@ -79,6 +79,7 @@ for template_path in templates:
for r, rbody in sorted(new_resources.items()):
if rbody['Type'] == 'AWS::EC2::Instance':
# XXX Assuming ImageId is always a Ref
ikey_val = end_template['Parameters'][rbody['Properties']['ImageId']['Ref']]
del end_template['Parameters'][rbody['Properties']['ImageId']['Ref']]
role = rbody.get('Metadata', {}).get('OpenStack::Role', r)
role = translate_role(role)
@ -102,7 +103,7 @@ for template_path in templates:
end_template['Resources'][role] = rbody
ikey = '%sImage' % (role)
end_template['Resources'][role]['Properties']['ImageId'] = {'Ref': ikey}
end_template['Parameters'][ikey] = {'Type': 'String'}
end_template['Parameters'][ikey] = ikey_val
elif rbody['Type'] == 'FileInclude':
with open(rbody['Path']) as rfile:
include_content = yaml.safe_load(rfile.read())