openstack
/
heat
Code Issues Proposed changes

Use latest HOT version in Resource.build_template_dict 

Change-Id: I9de95357fc1ca61fee2a79ab7adbfc8c2100cf63
This commit is contained in:
Jason Dunsmore 2016-06-29 12:52:14 -05:00
parent 68fa82cbc5
commit 0d33c45ccf
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
heat/engine/resource.py
View File

@ -2034,14 +2034,14 @@ class Resource(object):
params, props, outputs, description):
if tmpl_type == 'hot':
tmpl_dict = {
hot_tmpl.HOTemplate20150430.VERSION: '2015-04-30',
hot_tmpl.HOTemplate20150430.DESCRIPTION: description,
hot_tmpl.HOTemplate20150430.PARAMETERS: params,
hot_tmpl.HOTemplate20150430.OUTPUTS: outputs,
hot_tmpl.HOTemplate20150430.RESOURCES: {
hot_tmpl.HOTemplate20161014.VERSION: '2016-10-14',
hot_tmpl.HOTemplate20161014.DESCRIPTION: description,
hot_tmpl.HOTemplate20161014.PARAMETERS: params,
hot_tmpl.HOTemplate20161014.OUTPUTS: outputs,
hot_tmpl.HOTemplate20161014.RESOURCES: {
res_name: {
hot_tmpl.HOTemplate20150430.RES_TYPE: res_type,
hot_tmpl.HOTemplate20150430.RES_PROPERTIES: props}}}
hot_tmpl.HOTemplate20161014.RES_TYPE: res_type,
hot_tmpl.HOTemplate20161014.RES_PROPERTIES: props}}}
else:
tmpl_dict = {
cfn_tmpl.CfnTemplate.ALTERNATE_VERSION: '2012-12-12',

2
heat/tests/test_resource.py
View File

@ -1322,7 +1322,7 @@ class ResourceTest(common.HeatTestCase):
}
expected_template = {
'heat_template_version': '2015-04-30',
'heat_template_version': '2016-10-14',
'description': 'Initial template of TestResource',
'parameters': {
'name': {'type': 'string'},