diff options
| author |   divakar-padiyar-nandavar <divakar.padiyar-nandavar@hp.com> | 2013-08-08 07:57:43 -0600 |
|---|---|---|
| committer | divakar-padiyar-nandavar <divakar.padiyar-nandavar@hp.com> | 2013-08-08 08:09:13 -0600 |
| commit | 61a0528543c6d2f911dd301a11d8ef4d4aa7af59 (patch) | |
| tree | 8a84b80f131451984d3a743e4f3c3ff173e3e50c | |
| parent | 94eb778d718877da2abfe2af22d6bccf01c45668 (diff) | |
Fixed merge code populating properties from yaml.
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
| -rw-r--r-- | merge.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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()) |