diff options
| author | Thierry Carrez <thierry@openstack.org> | 2012-02-07 16:37:34 +0100 |
|---|---|---|
| committer | Thierry Carrez <thierry@openstack.org> | 2012-02-07 21:14:31 +0100 |
| commit | 71410724cd1516608ee58c37077bf9080da38de2 (patch) | |
| tree | 89d1b1c2930cef01565da8e5436ad8c2edb8a1bf /nova/compute | |
| parent | ae377f42e95b18438f4855c13230e077a870c64b (diff) | |
| download | nova-71410724cd1516608ee58c37077bf9080da38de2.tar.gz nova-71410724cd1516608ee58c37077bf9080da38de2.tar.xz nova-71410724cd1516608ee58c37077bf9080da38de2.zip | |
Remove ajaxterm from Nova
Removes copy of ajaxterm code, nova-ajax-console-proxy,
and support for get_ajax_console from Nova proper.
Implements blueprint remove-ajaxterm
Fixes bug 917963
Change-Id: I2c0ff427c53c0f63a18b10475d6b4cbe9a085d83
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() |
