diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 13 | ||||
| -rw-r--r-- | nova/compute/manager.py | 9 |
2 files changed, 0 insertions, 22 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index f54d184dd..2f4d3e200 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1574,19 +1574,6 @@ class API(base.Base): instance, params=params) @wrap_check_policy - def get_ajax_console(self, context, instance): - """Get a url to an AJAX Console.""" - output = self._call_compute_message('get_ajax_console', - context, - instance) - rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic, - {'method': 'authorize_ajax_console', - 'args': {'token': output['token'], 'host': output['host'], - 'port': output['port']}}) - return {'url': '%s/?token=%s' % (FLAGS.ajax_console_proxy_url, - output['token'])} - - @wrap_check_policy def get_vnc_console(self, context, instance, console_type): """Get a url to an instance Console.""" connect_info = self._call_compute_message('get_vnc_console', diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e5600af32..c7cd1baaf 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1553,15 +1553,6 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @wrap_instance_fault - def get_ajax_console(self, context, instance_uuid): - """Return connection information for an ajax console.""" - context = context.elevated() - LOG.debug(_("instance %s: getting ajax console"), instance_uuid) - instance_ref = self.db.instance_get_by_uuid(context, instance_uuid) - return self.driver.get_ajax_console(instance_ref) - - @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) - @wrap_instance_fault def get_vnc_console(self, context, instance_uuid, console_type): """Return connection information for a vnc console.""" context = context.elevated() |