x/gantt
Code Issues Proposed changes

incorporate feedback from termie

Browse Source
This commit is contained in:
Anthony Young
2011-03-29 14:53:38 -07:00
parent d2e589a626
commit 6ba413f154
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/nova-vncproxy
View File

@@ -71,8 +71,6 @@ if __name__ == "__main__":
LOG.audit(_("Starting nova-vnc-proxy node (version %s)"), LOG.audit(_("Starting nova-vnc-proxy node (version %s)"),
version.version_string_with_vcs()) version.version_string_with_vcs())
service.serve()
if not (os.path.exists(FLAGS.vncproxy_wwwroot) and if not (os.path.exists(FLAGS.vncproxy_wwwroot) and
os.path.exists(FLAGS.vncproxy_wwwroot + '/vnc_auto.html')): os.path.exists(FLAGS.vncproxy_wwwroot + '/vnc_auto.html')):
LOG.info(_("Missing vncproxy_wwwroot (version %s)"), LOG.info(_("Missing vncproxy_wwwroot (version %s)"),
@@ -96,6 +94,8 @@ if __name__ == "__main__":
else: else:
with_auth = auth.VNCNovaAuthMiddleware(with_logging) with_auth = auth.VNCNovaAuthMiddleware(with_logging)
service.serve()
server = wsgi.Server() server = wsgi.Server()
server.start(with_auth, FLAGS.vncproxy_port, host=FLAGS.vncproxy_host) server.start(with_auth, FLAGS.vncproxy_port, host=FLAGS.vncproxy_host)
server.wait() server.wait()

2
doc/source/runnova/vncconsole.rst
View File

@@ -36,7 +36,7 @@ Configuring the VNC Proxy
------------------------- -------------------------
nova-vnc-proxy requires a websocket enabled html client to work properly. At nova-vnc-proxy requires a websocket enabled html client to work properly. At
this time, the only tested client is a slightly modified fork of noVNC, which this time, the only tested client is a slightly modified fork of noVNC, which
you can at find git://github.com/sleepsonthefloor/noVNC.git. you can at find http://github.com/openstack/noVNC.git
.. todo:: add instruction for installing from package .. todo:: add instruction for installing from package