From b15bd9d778772ed86d5a0d8a8be92485596127a9 Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 12 Mar 2013 19:29:38 +0100
Subject: [PATCH] Revert NestedStack FnGetRefId changes

This partially reverts commit e376c83cbd57c0720336848e4b82e3b7b804a347.

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

Fixes bug #1154202

Change-Id: I2140afb4e9bf89b4eb73e45f4ef5974df98e87e1
---
 heat/engine/resources/stack.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index b196edb6..589e1f0a 100644
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -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(
-- 
2.45.2