openstack
/
heat
Code Issues Proposed changes

Merge "heat engine : allow NestedStack template validation to work"

This commit is contained in:
Jenkins 2013-01-08 18:49:58 +00:00 committed by Gerrit Code Review
parent cb8c06195e 69b359e47d
commit c590b586b9
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

@ -65,6 +65,8 @@ class Stack(resource.Resource):
def get_output(self, op):
stack = self.nested()
if not stack:
return None
if op not in stack.outputs:
raise exception.InvalidTemplateAttribute(
resource=self.physical_resource_name(), key=key)
@ -105,7 +107,7 @@ class NestedStack(Stack):
resource=self.physical_resource_name(), key=key)
prefix, dot, op = key.partition('.')
return self.get_output(op)
return unicode(self.get_output(op))
def resource_mapping():