Permalink
Browse files

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

  • Loading branch information...
2 parents f04360b + 2a9271e commit 27ac9d5f0ca4279753ee2984769094f2b4191619 Jenkins committed with openstack-gerrit Feb 8, 2012
Showing with 9 additions and 6 deletions.
  1. +9 −6 bin/nova-all
View
15 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))

0 comments on commit 27ac9d5

Please sign in to comment.