Use latest stable version for RG & ASG nested templates
Change-Id: I5924db9fa2a49825baef2faf88c533aca76ea081
This commit is contained in:
parent
d5c02aaba0
commit
cc7e2d6cb3
|
@ -149,7 +149,7 @@ class AutoScalingResourceGroup(aws_asg.AutoScalingGroup):
|
||||||
|
|
||||||
def _create_template(self, num_instances, num_replace=0,
|
def _create_template(self, num_instances, num_replace=0,
|
||||||
template_version=('heat_template_version',
|
template_version=('heat_template_version',
|
||||||
'2013-05-23')):
|
'2015-04-30')):
|
||||||
"""Create a template in the HOT format for the nested stack."""
|
"""Create a template in the HOT format for the nested stack."""
|
||||||
return super(AutoScalingResourceGroup,
|
return super(AutoScalingResourceGroup,
|
||||||
self)._create_template(num_instances, num_replace,
|
self)._create_template(num_instances, num_replace,
|
||||||
|
|
|
@ -32,7 +32,7 @@ from heat.engine import support
|
||||||
from heat.engine import template
|
from heat.engine import template
|
||||||
|
|
||||||
template_template = {
|
template_template = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {}
|
"resources": {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ def resource_templates(old_resources, resource_definition,
|
||||||
|
|
||||||
|
|
||||||
def make_template(resource_definitions,
|
def make_template(resource_definitions,
|
||||||
version=('heat_template_version', '2013-05-23'),
|
version=('heat_template_version', '2015-04-30'),
|
||||||
child_env=None):
|
child_env=None):
|
||||||
"""
|
"""
|
||||||
Return a Template object containing the given resource definitions.
|
Return a Template object containing the given resource definitions.
|
||||||
|
|
|
@ -129,7 +129,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
templ = {
|
templ = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "OverwrittenFnGetRefIdType",
|
"type": "OverwrittenFnGetRefIdType",
|
||||||
|
@ -162,7 +162,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "OverwrittenFnGetRefIdType",
|
"type": "OverwrittenFnGetRefIdType",
|
||||||
|
@ -182,7 +182,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {}
|
"resources": {}
|
||||||
}
|
}
|
||||||
self.assertEqual(expect, resg._assemble_nested([]))
|
self.assertEqual(expect, resg._assemble_nested([]))
|
||||||
|
@ -199,7 +199,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "OverwrittenFnGetRefIdType",
|
"type": "OverwrittenFnGetRefIdType",
|
||||||
|
@ -215,7 +215,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
|
|
||||||
def test_assemble_nested_rolling_update(self):
|
def test_assemble_nested_rolling_update(self):
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"depends_on": [],
|
"depends_on": [],
|
||||||
|
@ -249,7 +249,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
|
|
||||||
def test_assemble_nested_rolling_update_none(self):
|
def test_assemble_nested_rolling_update_none(self):
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"depends_on": [],
|
"depends_on": [],
|
||||||
|
@ -286,7 +286,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "ResourceWithListProp%index%",
|
"type": "ResourceWithListProp%index%",
|
||||||
|
@ -330,7 +330,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['group1']
|
snip = stack.t.resource_definitions(stack)['group1']
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "ResourceWithListProp%index%",
|
"type": "ResourceWithListProp%index%",
|
||||||
|
@ -355,7 +355,7 @@ class ResourceGroupTest(common.HeatTestCase):
|
||||||
res_def['type'] = "ResourceWithListProp__foo__"
|
res_def['type'] = "ResourceWithListProp__foo__"
|
||||||
resg = resource_group.ResourceGroup('test', snip, stack)
|
resg = resource_group.ResourceGroup('test', snip, stack)
|
||||||
expect = {
|
expect = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"0": {
|
"0": {
|
||||||
"type": "ResourceWithListProp__foo__",
|
"type": "ResourceWithListProp__foo__",
|
||||||
|
|
|
@ -1211,7 +1211,7 @@ class SoftwareDeploymentGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['deploy_mysql']
|
snip = stack.t.resource_definitions(stack)['deploy_mysql']
|
||||||
resg = sd.SoftwareDeploymentGroup('test', snip, stack)
|
resg = sd.SoftwareDeploymentGroup('test', snip, stack)
|
||||||
templ = {
|
templ = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"server1": {
|
"server1": {
|
||||||
'type': 'OS::Heat::SoftwareDeployment',
|
'type': 'OS::Heat::SoftwareDeployment',
|
||||||
|
|
|
@ -328,7 +328,7 @@ class StructuredDeploymentGroupTest(common.HeatTestCase):
|
||||||
snip = stack.t.resource_definitions(stack)['deploy_mysql']
|
snip = stack.t.resource_definitions(stack)['deploy_mysql']
|
||||||
resg = sc.StructuredDeploymentGroup('test', snip, stack)
|
resg = sc.StructuredDeploymentGroup('test', snip, stack)
|
||||||
templ = {
|
templ = {
|
||||||
"heat_template_version": "2013-05-23",
|
"heat_template_version": "2015-04-30",
|
||||||
"resources": {
|
"resources": {
|
||||||
"server1": {
|
"server1": {
|
||||||
'type': 'OS::Heat::StructuredDeployment',
|
'type': 'OS::Heat::StructuredDeployment',
|
||||||
|
|
Loading…
Reference in New Issue