diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-03-07 19:33:24 +0000 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-03-07 19:33:24 +0000 |
| commit | f72366f007239656d3d5e3fc80cd277758eedf9b (patch) | |
| tree | 27a415751b47ffc7172e6404c4cda4e5946c4373 | |
| parent | 421cab431253290445608c67c14ec736c3bd2708 (diff) | |
| download | nova-f72366f007239656d3d5e3fc80cd277758eedf9b.tar.gz nova-f72366f007239656d3d5e3fc80cd277758eedf9b.tar.xz nova-f72366f007239656d3d5e3fc80cd277758eedf9b.zip | |
Create --paste_config flag defaulting to api-paste.ini and mv etc/nova-api.conf to match
| -rwxr-xr-x | bin/nova-api | 7 | ||||
| -rw-r--r-- | etc/api-paste.ini (renamed from etc/nova-api.conf) | 0 |
2 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) diff --git a/etc/nova-api.conf b/etc/api-paste.ini index 9f7e93d4c..9f7e93d4c 100644 --- a/etc/nova-api.conf +++ b/etc/api-paste.ini |