x/gantt
Code Issues Proposed changes

Merged with trunk and fixed conflict. Sigh.

Browse Source
This commit is contained in:
Justin Santa Barbara
2011-03-07 15:30:58 -08:00
parent acc93f3df0 25a9ab84bb
commit 33ec634bc2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/nova-api
View File

@@ -45,6 +45,8 @@ from nova import wsgi
LOG = logging.getLogger('nova.api')
FLAGS = flags.FLAGS
flags.DEFINE_string('paste_config', "api-paste.ini",
'File name for the paste.deploy config for nova-api')
if __name__ == '__main__':
@@ -57,9 +59,10 @@ if __name__ == '__main__':
for flag in FLAGS:
flag_get = FLAGS.get(flag, None)
LOG.debug("%(flag)s : %(flag_get)s" % locals())
conf = wsgi.paste_config_file('nova-api.conf')
conf = wsgi.paste_config_file(FLAGS.paste_config)
if not conf:
LOG.error(_("No paste configuration found for: %s"), 'nova-api.conf')
LOG.error(_("No paste configuration found for: %s"),
FLAGS.paste_config)
sys.exit(1)
else:
service = service.serve_wsgi(service.ApiService, conf)