diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:36:04 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:36:04 -0800 |
| commit | e69c802aaf40f3b90789aeef8bf3ef5dcbbcb2f3 (patch) | |
| tree | 1010b5e327d02ac71099380d64adc5d41b83bc4c /bin/nova-api | |
| parent | be54e37bbd79293ce41f8fa8dfe40022aebb6fff (diff) | |
| download | nova-e69c802aaf40f3b90789aeef8bf3ef5dcbbcb2f3.tar.gz nova-e69c802aaf40f3b90789aeef8bf3ef5dcbbcb2f3.tar.xz nova-e69c802aaf40f3b90789aeef8bf3ef5dcbbcb2f3.zip | |
Moved FLAGS.paste_config to its re-usable location
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/bin/nova-api b/bin/nova-api index f48dbe5a5..85ca4eefd 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -45,9 +45,6 @@ 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__': utils.default_flagfile() @@ -59,11 +56,6 @@ 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(FLAGS.paste_config) - if not conf: - LOG.error(_("No paste configuration found for: %s"), - FLAGS.paste_config) - sys.exit(1) - else: - service = service.serve_wsgi(service.ApiService, conf) - service.wait() + + service = service.serve_wsgi(service.ApiService) + service.wait() |