openstack/tripleo-heat-templates
Code Issues Proposed changes

Add support for merging OS::Nova::Server

Browse Source 
Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
This commit is contained in:
Clint Byrum 2013-09-13 08:42:01 -07:00
parent a5320b8f49
commit a8d5dc5a23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
merge.py
View File

@ -44,6 +44,11 @@ def resolve_params(item, param, value):
item = new_item item = new_item
return item return item
MERGABLE_TYPES = {'OS::Nova::Server':
{'image': 'image'},
'AWS::EC2::Instance':
{'image': 'ImageId'},
}
errors = [] errors = []
end_template={'HeatTemplateFormatVersion': '2012-12-12', end_template={'HeatTemplateFormatVersion': '2012-12-12',
@ -77,10 +82,11 @@ for template_path in templates:
new_resources = template.get('Resources', {}) new_resources = template.get('Resources', {})
for r, rbody in sorted(new_resources.items()): for r, rbody in sorted(new_resources.items()):
if rbody['Type'] == 'AWS::EC2::Instance': if rbody['Type'] in MERGABLE_TYPES:
image_key = MERGABLE_TYPES[rbody['Type']]['image']
# XXX Assuming ImageId is always a Ref # XXX Assuming ImageId is always a Ref
ikey_val = end_template['Parameters'][rbody['Properties']['ImageId']['Ref']] ikey_val = end_template['Parameters'][rbody['Properties'][image_key]['Ref']]
del end_template['Parameters'][rbody['Properties']['ImageId']['Ref']] del end_template['Parameters'][rbody['Properties'][image_key]['Ref']]
role = rbody.get('Metadata', {}).get('OpenStack::Role', r) role = rbody.get('Metadata', {}).get('OpenStack::Role', r)
role = translate_role(role) role = translate_role(role)
if role != r: if role != r:
@ -102,7 +108,7 @@ for template_path in templates:
end_template['Resources'] = {} end_template['Resources'] = {}
end_template['Resources'][role] = rbody end_template['Resources'][role] = rbody
ikey = '%sImage' % (role) ikey = '%sImage' % (role)
end_template['Resources'][role]['Properties']['ImageId'] = {'Ref': ikey} end_template['Resources'][role]['Properties'][image_key] = {'Ref': ikey}
end_template['Parameters'][ikey] = ikey_val end_template['Parameters'][ikey] = ikey_val
elif rbody['Type'] == 'FileInclude': elif rbody['Type'] == 'FileInclude':
with open(rbody['Path']) as rfile: with open(rbody['Path']) as rfile: