openstack/deb-heat
Code Issues Proposed changes

Revert NestedStack FnGetRefId changes

Browse Source 
This partially reverts commit e376c83cbd.

Allow StackResource to set the resource_id, since it will be the one
retrieving the stack using it.

Fixes bug #1154202

Change-Id: I2140afb4e9bf89b4eb73e45f4ef5974df98e87e1
This commit is contained in:
Zane Bitter 2013-03-12 19:29:38 +01:00
parent f2b1d4b433
commit b15bd9d778
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/stack.py
View File

@ -43,7 +43,6 @@ class NestedStack(stack_resource.StackResource):
template = template_format.parse(template_data)
self.create_with_template(template, self.properties[PROP_PARAMETERS])
self.resource_id_set(self.nested().identifier().arn())
def handle_update(self, json_snippet):
return self.UPDATE_REPLACE
@ -51,6 +50,9 @@ class NestedStack(stack_resource.StackResource):
def handle_delete(self):
self.delete_nested()
def FnGetRefId(self):
return self.nested().identifier().arn()
def FnGetAtt(self, key):
if not key.startswith('Outputs.'):
raise exception.InvalidTemplateAttribute(