Create --paste_config flag defaulting to api-paste.ini and mv etc/nova-api.conf to match
This commit is contained in:
parent
421cab4312
commit
f72366f007
@ -43,6 +43,8 @@ from nova import wsgi
|
|||||||
LOG = logging.getLogger('nova.api')
|
LOG = logging.getLogger('nova.api')
|
||||||
|
|
||||||
FLAGS = flags.FLAGS
|
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",
|
flags.DEFINE_string('ec2_listen', "0.0.0.0",
|
||||||
'IP address for EC2 API to listen')
|
'IP address for EC2 API to listen')
|
||||||
flags.DEFINE_integer('ec2_listen_port', 8773, 'port 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:
|
for flag in FLAGS:
|
||||||
flag_get = FLAGS.get(flag, None)
|
flag_get = FLAGS.get(flag, None)
|
||||||
LOG.debug("%(flag)s : %(flag_get)s" % locals())
|
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:
|
if conf:
|
||||||
run_app(conf)
|
run_app(conf)
|
||||||
else:
|
else:
|
||||||
LOG.error(_("No paste configuration found for: %s"), 'nova-api.conf')
|
LOG.error(_("No paste configuration found for: %s"),
|
||||||
|
FLAGS.paste_config)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user