summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2010-12-22 12:39:59 -0600
committerCerberus <matt.dietz@rackspace.com>2010-12-22 12:39:59 -0600
commit21867297b673ec9fe055fb6c7e4a3dadcfa6fdd2 (patch)
tree3a849bdf380da3e5f26b47b59ce607841e8ea0e9 /nova/api
parent7f83b9d963fee2d65b267542c7cd8c48df23a1ef (diff)
downloadnova-21867297b673ec9fe055fb6c7e4a3dadcfa6fdd2.tar.gz
nova-21867297b673ec9fe055fb6c7e4a3dadcfa6fdd2.tar.xz
nova-21867297b673ec9fe055fb6c7e4a3dadcfa6fdd2.zip
Minor bug fix
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/__init__.py1
-rw-r--r--nova/api/openstack/images.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 80f9f2109..e081ec10b 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -24,6 +24,7 @@ Root WSGI middleware for all API controllers.
:ec2api_subdomain: subdomain running the EC2 API (default: ec2)
"""
+import logging
import routes
import webob.dec
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index fe8d9d75f..d3312aba8 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -53,6 +53,7 @@ class Controller(wsgi.Controller):
images = common.limited(images, req)
except NotImplementedError:
# Emulate detail() using repeated calls to show()
+ ctxt = req.environ['nova.context']
images = self._service.index(ctxt)
images = common.limited(images, req)
images = [self._service.show(ctxt, i['id']) for i in images]