diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-23 00:23:08 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-23 00:23:08 -0800 |
| commit | 151ffc57a3dd5217981dbaa1754384290d7d73ec (patch) | |
| tree | c4d5fe4b880dd2d9ef9bc455731be5b3f94601a6 | |
| parent | 86b9e564fec24423485b5087e41584abd0de1da0 (diff) | |
| download | nova-151ffc57a3dd5217981dbaa1754384290d7d73ec.tar.gz nova-151ffc57a3dd5217981dbaa1754384290d7d73ec.tar.xz nova-151ffc57a3dd5217981dbaa1754384290d7d73ec.zip | |
move port range for ajaxterm to flag
| -rw-r--r-- | nova/virt/libvirt_conn.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 55754ea48..1049eaefa 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -87,6 +87,9 @@ flags.DEFINE_string('libvirt_uri', flags.DEFINE_bool('allow_project_net_traffic', True, 'Whether to allow in project network traffic') +flags.DEFINE_string('ajaxterm_portrange', + '10000-12000', + 'Range of ports that ajaxterm should randomly try to bind') def get_connection(read_only): @@ -388,8 +391,9 @@ class LibvirtConnection(object): @exception.wrap_exception def get_ajax_console(self, instance): def get_open_port(): + start_port, end_port = FLAGS.ajaxterm_portrange.split("-") for i in xrange(0,100): # don't loop forever - port = random.randint(10000, 12000) #TODO - make flag + port = random.randint(int(start_port), int(end_port)) # 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) |