diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-08 14:42:07 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-08 14:42:07 -0600 |
| commit | 81d1afedd137955e9fa9396cec4b0cfa0c2aa9a6 (patch) | |
| tree | 5df0102ef8fdff277f931707a0ce2e9c9bdb7041 /bin/nova-api | |
| parent | 1caceddf431a1ad1ef22235c2206bccf39fde5c5 (diff) | |
| parent | b238805d2ee9c19d3fb9b4dc43fa404630bdfaab (diff) | |
| download | nova-81d1afedd137955e9fa9396cec4b0cfa0c2aa9a6.tar.gz nova-81d1afedd137955e9fa9396cec4b0cfa0c2aa9a6.tar.xz nova-81d1afedd137955e9fa9396cec4b0cfa0c2aa9a6.zip | |
Merge from trunk
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 14be4b841..0b2a44c88 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -43,6 +43,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') flags.DEFINE_string('ec2_listen', "0.0.0.0", 'IP address for EC2 API to listen') flags.DEFINE_integer('ec2_listen_port', 8773, 'port for ec2 api to listen') @@ -90,8 +92,9 @@ 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 conf: run_app(conf) else: - LOG.error(_("No paste configuration found for: %s"), 'nova-api.conf') + LOG.error(_("No paste configuration found for: %s"), + FLAGS.paste_config) |