openstack
/
heat
Code Issues Proposed changes

Use latest stable version for RG & ASG nested templates 

Change-Id: I5924db9fa2a49825baef2faf88c533aca76ea081
This commit is contained in:
Rabi Mishra 2015-08-27 16:15:43 +05:30
parent d5c02aaba0
commit cc7e2d6cb3
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/openstack/heat/autoscaling_group.py
View File

@ -149,7 +149,7 @@ class AutoScalingResourceGroup(aws_asg.AutoScalingGroup):
def _create_template(self, num_instances, num_replace=0,
template_version=('heat_template_version',
'2013-05-23')):
'2015-04-30')):
"""Create a template in the HOT format for the nested stack."""
return super(AutoScalingResourceGroup,
self)._create_template(num_instances, num_replace,

2
heat/engine/resources/openstack/heat/resource_group.py
View File

@ -32,7 +32,7 @@ from heat.engine import support
from heat.engine import template
template_template = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {}
}

2
heat/scaling/template.py
View File

@ -40,7 +40,7 @@ def resource_templates(old_resources, resource_definition,
def make_template(resource_definitions,
version=('heat_template_version', '2013-05-23'),
version=('heat_template_version', '2015-04-30'),
child_env=None):
"""
Return a Template object containing the given resource definitions.

18
heat/tests/test_resource_group.py
View File

@ -129,7 +129,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
templ = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "OverwrittenFnGetRefIdType",
@ -162,7 +162,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "OverwrittenFnGetRefIdType",
@ -182,7 +182,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {}
}
self.assertEqual(expect, resg._assemble_nested([]))
@ -199,7 +199,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "OverwrittenFnGetRefIdType",
@ -215,7 +215,7 @@ class ResourceGroupTest(common.HeatTestCase):
def test_assemble_nested_rolling_update(self):
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"depends_on": [],
@ -249,7 +249,7 @@ class ResourceGroupTest(common.HeatTestCase):
def test_assemble_nested_rolling_update_none(self):
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"depends_on": [],
@ -286,7 +286,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "ResourceWithListProp%index%",
@ -330,7 +330,7 @@ class ResourceGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['group1']
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "ResourceWithListProp%index%",
@ -355,7 +355,7 @@ class ResourceGroupTest(common.HeatTestCase):
res_def['type'] = "ResourceWithListProp__foo__"
resg = resource_group.ResourceGroup('test', snip, stack)
expect = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"0": {
"type": "ResourceWithListProp__foo__",

2
heat/tests/test_software_deployment.py
View File

@ -1211,7 +1211,7 @@ class SoftwareDeploymentGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['deploy_mysql']
resg = sd.SoftwareDeploymentGroup('test', snip, stack)
templ = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"server1": {
'type': 'OS::Heat::SoftwareDeployment',

2
heat/tests/test_structured_config.py
View File

@ -328,7 +328,7 @@ class StructuredDeploymentGroupTest(common.HeatTestCase):
snip = stack.t.resource_definitions(stack)['deploy_mysql']
resg = sc.StructuredDeploymentGroup('test', snip, stack)
templ = {
"heat_template_version": "2013-05-23",
"heat_template_version": "2015-04-30",
"resources": {
"server1": {
'type': 'OS::Heat::StructuredDeployment',