diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:44:45 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-10 13:44:45 -0800 |
| commit | 4edfa8ea26f8e820674e8bebbe34b6ed5885a69b (patch) | |
| tree | c74ad6915176e169a38d2601e6fb805e2806e8a7 /nova/compute | |
| parent | 220259d6ca9131c738a2d4ea9cd28ca64edbcfeb (diff) | |
consolidate boto_extensions.py and euca-get-ajax-console, fix bugs
from previous trunk merge
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index adf4dbe43..4d25bd705 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -416,13 +416,13 @@ class API(base.Base): def get_ajax_console(self, context, instance_id): """Get a url to an AJAX Console""" - instance_ref = db.instance_get_by_internal_id(context, instance_id) + instance = self.get(context, instance_id) output = rpc.call(context, '%s.%s' % (FLAGS.compute_topic, - instance_ref['host']), + instance['host']), {'method': 'get_ajax_console', - 'args': {'instance_id': instance_ref['id']}}) + 'args': {'instance_id': instance['id']}}) rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic, {'method': 'authorize_ajax_console', |