diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-09-18 06:41:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-09-18 06:41:08 +0000 |
| commit | 6e766483306ae0dabd4fff47f9234ede588f7be4 (patch) | |
| tree | 77baee1b5233801c0f00fdc1e89d29d5ce6eafba /tripleo_heat_merge/merge.py | |
| parent | 622d4cb6cf92704f7cbdd8683dd5c4d406646ce5 (diff) | |
| parent | 9e262a51e9777d2653f4dec64dc0c17c09ec4917 (diff) | |
Merge "Deprecate Role and ImageBuilder metadata handling"
Diffstat (limited to 'tripleo_heat_merge/merge.py')
| -rw-r--r-- | tripleo_heat_merge/merge.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py index 49aee6f2..b5bec0f4 100644 --- a/tripleo_heat_merge/merge.py +++ b/tripleo_heat_merge/merge.py @@ -332,6 +332,9 @@ def merge(templates, master_role=None, slave_roles=None, # XXX Assuming ImageId is always a Ref 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]] + 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 = translate_role(role, master_role, slave_roles) 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 == 'OpenStack::ImageBuilder::Elements': 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 if mbody != end_template[lang.resources][role][lang.metadata][m]: errors.append('Role %s metadata key %s conflicts.' % |