openstack
/
sahara
Code Issues Proposed changes

move heat template version to common module 

actually heat template version is an important constant.
to make that same everywhere moving that to common configs.

Change-Id: I1af5147e4113eda11328a7b521c07d2b798eaaec
This commit is contained in:
Vitaly Gridnev 2016-03-01 13:47:46 +03:00
parent 66d5d3fd16
commit 3002cd7ffa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sahara/service/heat/commons.py
View File

@ -14,3 +14,4 @@
# limitations under the License.
HEAT_ENGINE_VERSION = 'heat.3.0'
HEAT_TEMPLATE_VERSION = '2013-05-23'

6
sahara/service/heat/templates.py
View File

@ -146,7 +146,7 @@ class ClusterStack(object):
outputs = {}
resources = self._serialize_resources(outputs)
return yaml.safe_dump({
"heat_template_version": "2013-05-23",
"heat_template_version": heat_common.HEAT_TEMPLATE_VERSION,
"description": self.base_info,
"resources": resources,
"outputs": outputs
@ -234,7 +234,7 @@ class ClusterStack(object):
if ng.cluster.anti_affinity:
parameters[SERVER_GROUP_PARAM_NAME] = {'type': "string"}
return yaml.safe_dump({
"heat_template_version": "2013-05-23",
"heat_template_version": heat_common.HEAT_TEMPLATE_VERSION,
"description": self._node_group_description(ng),
"parameters": parameters,
"resources": self._serialize_instance(ng),
@ -486,7 +486,7 @@ class ClusterStack(object):
"local_to_instance": {"get_param": "instance"}}
return yaml.safe_dump({
"heat_template_version": "2013-05-23",
"heat_template_version": heat_common.HEAT_TEMPLATE_VERSION,
"description": self._volume_for_node_group_description(ng),
"parameters": {
"volume_index": {