Description: revert 2fab910106323928108794b922748ba72e495e7e
Author: Julien Danjou <acid@debian.org>

---
Origin: vendor
Forwarded: not-needed

--- openstackx-0~dev20111128.orig/extensions/admin.py
+++ openstackx-0~dev20111128/extensions/admin.py
@@ -294,10 +294,10 @@ class ExtrasConsoleController(object):
         compute_api = compute.API()
         if console_type == 'text':
             output = compute_api.get_console_output(
-                      context, instance=compute_api.get(context, server_id))
+                      context, instance_id=server_id)
         elif console_type == 'vnc':
             output = compute_api.get_vnc_console(
-                      context, instance=compute_api.get(context, server_id))['url']
+                      context, instance_id=server_id)['url']
         else:
             raise Exception("Not Implemented")
         return {'console':{'id': '', 'type': console_type, 'output': output}}
