openstack
/
nova
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2012-02-08 10:02:34 +00:00 committed by Gerrit Code Review
parent f04360b375 2a9271eab0
commit 27ac9d5f0c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/nova-all
View File

@ -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))