openstack
/
sahara
Code Issues Proposed changes

Merge "move heat template version to common module"

This commit is contained in:
Jenkins 2016-03-02 07:16:54 +00:00 committed by Gerrit Code Review
parent c0abc31db6 3002cd7ffa
commit a102c4d70f
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": {