summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2014-03-19 15:16:32 -0700
committerRobert Collins <rbtcollins@hp.com>2014-04-16 14:10:48 +1200
commitbe5af1a35e6bbb9e517fd953a5fe0e2467676b91 (patch)
tree021e451d33e64007e9fae34d273d652709cc6aaf /tripleo_heat_merge
parenta830cea3b1071f70485f427877ac4577f5d13e16 (diff)
Switch overcloud to software-config
This migrates the overcloud to using OS::Heat::StructuredConfig and OS::Heat::StructuredDeployment. With those tools, we can decouple servers from software configuration and begin to deprecate features in tripleo_heat_merge. Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
Diffstat (limited to 'tripleo_heat_merge')
-rw-r--r--tripleo_heat_merge/merge.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py
index 4571d289..127a0e03 100644
--- a/tripleo_heat_merge/merge.py
+++ b/tripleo_heat_merge/merge.py
@@ -292,7 +292,11 @@ def merge(templates, master_role=None, slave_roles=None,
errors.append('Role %s metadata key %s conflicts.' %
(role, m))
continue
- end_template['Resources'][role]['Metadata'][m] = mbody
+ role_res = end_template['Resources'][role]
+ if role_res['Type'] == 'OS::Heat::StructuredConfig':
+ end_template['Resources'][role]['Properties']['config'][m] = mbody
+ else:
+ end_template['Resources'][role]['Metadata'][m] = mbody
continue
if 'Resources' not in end_template:
end_template['Resources'] = {}
@@ -315,6 +319,8 @@ def merge(templates, master_role=None, slave_roles=None,
include_content = resolve_params(include_content,
replace_param,
replace_value)
+ if 'Resources' not in end_template:
+ end_template['Resources'] = {}
end_template['Resources'][r] = include_content
else:
if r in end_template.get('Resources', {}):