Fix xvpvncproxy error in nova-all (lp#928489)

Running nova-all, I see:

  (nova): TRACE: NoSuchOptError: no such option: xvpvncproxy_manager

xvp_proxy is a WSGIService, not a Service.

Change-Id: I073d6536134a4fc8d819c808a6c96b02390b556d

1 files changed, 9 insertions, 6 deletions

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