diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-22 18:52:43 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-22 18:52:43 -0800 |
| commit | 4e9b4c9ce31a7a50d7e38d5e0bd71718d5bb8b95 (patch) | |
| tree | e86d9bf88d98204246b6fe8862cad8f51e8d32e6 | |
| parent | 0093342106cc270859df0511dbefad8ec8fc2320 (diff) | |
| download | nova-4e9b4c9ce31a7a50d7e38d5e0bd71718d5bb8b95.tar.gz nova-4e9b4c9ce31a7a50d7e38d5e0bd71718d5bb8b95.tar.xz nova-4e9b4c9ce31a7a50d7e38d5e0bd71718d5bb8b95.zip | |
minor notes, commit before rewriting proxy with eventlet
| -rwxr-xr-x | bin/nova-ajax-proxy | 1 | ||||
| -rw-r--r-- | nova/compute/api.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/bin/nova-ajax-proxy b/bin/nova-ajax-proxy index 76a70d246..4948897cc 100755 --- a/bin/nova-ajax-proxy +++ b/bin/nova-ajax-proxy @@ -46,7 +46,6 @@ class AjaxConsoleProxyRequest(ProxyRequest): args = auth_info['args'] auth_info['last_activity_at'] = time.time() - self.uri = ("http://%s:%s%s?token=%s"% ( str(args['host']), str(args['port']), diff --git a/nova/compute/api.py b/nova/compute/api.py index 1acf320ae..3e9b58db5 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -331,7 +331,6 @@ class ComputeAPI(base.Base): {'method': 'get_ajax_console', 'args': {'instance_id': instance_ref['id']}}) - # TODO: make this a call rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic, {'method': 'authorize_ajax_console', 'args': {'token': output['token'], 'host': output['host'], diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 658efa8d1..55754ea48 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -389,7 +389,7 @@ class LibvirtConnection(object): def get_ajax_console(self, instance): def get_open_port(): for i in xrange(0,100): # don't loop forever - port = random.randint(10000, 12000) + port = random.randint(10000, 12000) #TODO - make flag # netcat will exit with 0 only if the port is in use, # so a nonzero return value implies it is unused cmd = 'netcat 0.0.0.0 %s -w 1 </dev/null || echo free' % (port) |