diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
| commit | be54e37bbd79293ce41f8fa8dfe40022aebb6fff (patch) | |
| tree | 8a46ee357f8fec2647bc9839c63b2053db343758 /bin/nova-api | |
| parent | 8e0fd37ddfbe88df296cf45583f0b3e4fa4d7a75 (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (diff) | |
| download | nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.gz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.xz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.zip | |
Merged with trunk and fixed conflict. Sigh.
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index c921ec45c..f48dbe5a5 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -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) |