openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Deprecate Role and ImageBuilder metadata handling"

Browse Source
This commit is contained in:
Jenkins
2014-09-18 06:41:08 +00:00
committed by Gerrit Code Review
parent 622d4cb6cf 9e262a51e9
commit 6e76648330
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tripleo_heat_merge/merge.py
View File

@@ -332,6 +332,9 @@ def merge(templates, master_role=None, slave_roles=None,
# XXX Assuming ImageId is always a Ref # XXX Assuming ImageId is always a Ref
ikey_val = end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]] ikey_val = end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]]
del end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]] del end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]]
if 'OpenStack::Role' in rbody.get(lang.metadata, {}):
sys.stderr.write("WARNING: OpenStack::Role is deprecated"
" and will be removed in a later release\n");
role = rbody.get(lang.metadata, {}).get('OpenStack::Role', r) role = rbody.get(lang.metadata, {}).get('OpenStack::Role', r)
role = translate_role(role, master_role, slave_roles) role = translate_role(role, master_role, slave_roles)
if role != r: if role != r:
@@ -342,6 +345,10 @@ def merge(templates, master_role=None, slave_roles=None,
if m in end_template[lang.resources][role].get(lang.metadata, {}): if m in end_template[lang.resources][role].get(lang.metadata, {}):
if m == 'OpenStack::ImageBuilder::Elements': if m == 'OpenStack::ImageBuilder::Elements':
end_template[lang.resources][role][lang.metadata][m].extend(mbody) end_template[lang.resources][role][lang.metadata][m].extend(mbody)
sys.stderr.write(
"WARNING: OpenStack::ImageBuilder::Elements"
" is deprecated and will be removed in a"
" later release\n");
continue continue
if mbody != end_template[lang.resources][role][lang.metadata][m]: if mbody != end_template[lang.resources][role][lang.metadata][m]:
errors.append('Role %s metadata key %s conflicts.' % errors.append('Role %s metadata key %s conflicts.' %