From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 19 Jun 2012 06:04:52 +0000 (+1000)
Subject: Fix the metadata rpc functions
X-Git-Tag: 2014.1~1703
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6ad3c5c3ea8e4bcbffabc386cb85e5d0cf5daba5;p=openstack-build%2Fheat-build.git

Fix the metadata rpc functions

Change-Id: Id3a071a45037d85920d273fa198d59602443026d
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
---

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index f5ea1bb7..e8e7a1f1 100644
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -28,6 +28,7 @@ from heat import manager
 from heat.db import api as db_api
 from heat.common import config
 from heat.common import utils as heat_utils
+from heat.common import context as ctxtlib
 from heat.engine import parser
 from heat.engine import resources
 from heat.engine import watchrule
@@ -465,9 +466,9 @@ class EngineManager(manager.Manager):
         """
         Return the resource IDs of the given stack.
         """
-        stack = db_api.stack_get_by_name(context, stack_name)
+        stack = db_api.stack_get_by_name(None, stack_name)
         if stack:
-            return [res.name for res in stack]
+            return [res.name for res in stack.resources]
         else:
             return None
 
@@ -546,7 +547,8 @@ class EngineManager(manager.Manager):
             else:
                 s = db_api.stack_get_by_name(None, wr.stack_name)
                 if s:
-                    ctxt = context.RequestContext.from_dict(dict(s.user_creds))
+                    user_creds = db_api.user_creds_get(s.user_creds_id)
+                    ctxt = ctxtlib.RequestContext.from_dict(dict(user_creds))
                     ps = parser.Stack(ctxt, s.name,
                                       s.raw_template.parsed_template.template,
                                       s.id)