From 40c8a8a1a1e834c4e5bb61c853397a90475d83ff Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Mon, 20 Dec 2010 17:36:10 -0600
Subject: Typo fix, stubbing out to use admin project for now

---
 nova/api/openstack/__init__.py | 4 +++-
 nova/api/openstack/images.py   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index b9ecbd9b8..178838dfd 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -89,7 +89,9 @@ class AuthMiddleware(wsgi.Middleware):
         if not user:
             return faults.Fault(webob.exc.HTTPUnauthorized())
 
-        req.environ['nova.context'] = context.RequestContext(user, user)
+        #FIXME(sirp): stubbing project to admin for now
+        project = manager.AuthManager().get_project('admin')
+        req.environ['nova.context'] = context.RequestContext(user, project)
         return self.application
 
 
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4a0a8e6f1..78849223d 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -46,8 +46,9 @@ class Controller(wsgi.Controller):
 
     def detail(self, req):
         """Return all public images in detail."""
+        ctxt = req.environ['nova.context']
         try:
-            images = self._service.detail(req.environ['nova.context'])
+            images = self._service.detail(ctxt)
             images = nova.api.openstack.limited(images, req)
         except NotImplementedError:
             # Emulate detail() using repeated calls to show()
-- 
cgit