summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-17 00:19:09 +0000
committerGerrit Code Review <review@openstack.org>2013-01-17 00:19:09 +0000
commit65d75430af77367622e660f57361b972a0f8dac1 (patch)
treefdab2fd55aefee2f4342040dc1a95ac2ac8d1304 /nova/api
parent01f204efdf4cee1823475fd346ce6dbaca915715 (diff)
parent6130aac4ec28cc7440615ac9cfde2a6a0083b196 (diff)
Merge "enables admin to view instance fault "details""
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/views/servers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py
index d281f6a61..939515468 100644
--- a/nova/api/openstack/compute/views/servers.py
+++ b/nova/api/openstack/compute/views/servers.py
@@ -211,9 +211,9 @@ class ViewBuilder(common.ViewBuilder):
if fault.get('details', None):
is_admin = False
- context = getattr(request, 'context', None)
+ context = request.environ["nova.context"]
if context:
- is_admin = getattr(request.context, 'is_admin', False)
+ is_admin = getattr(context, 'is_admin', False)
if is_admin or fault['code'] != 500:
fault_dict['details'] = fault["details"]