Implements blueprint vnc-console-cleanup

 * Creates a unified way to access vnc consoles for xenserver and libvirt
 * Now supports both java and websocket clients
 * Removes nova-vncproxy - a replacement version of this (nova-novncproxy) can be found as described in vncconsole.rst
 * Adds nova-xvpvncproxy, which supports a java vnc client
 * Adds api extension to access java and novnc access_urls
 * Fixes proxy server to close/shutdown sockets more cleanly
 * Address style feedback
 * Use new-style extension format
 * Fix setup.py
 * utils.gen_uuid must be wrapped like str(utils.gen_uuid()) or it can't be serialized

Change-Id: I5e42e2f160e8e3476269bd64b0e8aa77e66c918c

1 files changed, 1 insertions, 7 deletions

diff --git a/bin/nova-all b/bin/nova-all
index 497195bda..9c9e2bbaa 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -44,7 +44,6 @@ from nova import flags
 from nova import log as logging
 from nova import service
 from nova import utils
-from nova.vnc import server
 from nova.objectstore import s3server
 
 
@@ -60,17 +59,12 @@ if __name__ == '__main__':
             servers.append(service.WSGIService(api))
         except (Exception, SystemExit):
             logging.exception(_('Failed to load %s') % '%s-api' % api)
-    # nova-vncproxy
-    try:
-        servers.append(server.get_wsgi_server())
-    except (Exception, SystemExit):
-        logging.exception(_('Failed to load %s') % 'vncproxy-wsgi')
     # nova-objectstore
     try:
         servers.append(s3server.get_wsgi_server())
     except (Exception, SystemExit):
         logging.exception(_('Failed to load %s') % 'objectstore-wsgi')
-    for binary in ['nova-vncproxy', 'nova-compute', 'nova-volume',
+    for binary in ['nova-xvpvncproxy', 'nova-compute', 'nova-volume',
                    'nova-network', 'nova-scheduler', 'nova-vsa']:
         try:
             servers.append(service.Service.create(binary=binary))