x/gantt
Code Issues Proposed changes

Fix DescribeRegion answer by using specific 'listen' configuration parameter instead of overloading ec2_host

Browse Source
This commit is contained in:
Thierry Carrez
2011-02-14 14:26:32 +01:00
parent cf1286b320
commit dc33f73885
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/nova-api
View File

@@ -59,12 +59,12 @@ def run_app(paste_config_file):
LOG.debug(_("App Config: %(api)s\n%(config)r") % locals()) LOG.debug(_("App Config: %(api)s\n%(config)r") % locals())
wsgi.paste_config_to_flags(config, { wsgi.paste_config_to_flags(config, {
"verbose": FLAGS.verbose, "verbose": FLAGS.verbose,
"%s_host" % api: config.get('host', '0.0.0.0'), "%s_host" % api: getattr(FLAGS, "%s_host" % api),
"%s_port" % api: getattr(FLAGS, "%s_port" % api)}) "%s_port" % api: getattr(FLAGS, "%s_port" % api)})
LOG.info(_("Running %s API"), api) LOG.info(_("Running %s API"), api)
app = wsgi.load_paste_app(paste_config_file, api) app = wsgi.load_paste_app(paste_config_file, api)
apps.append((app, getattr(FLAGS, "%s_port" % api), apps.append((app, getattr(FLAGS, "%s_port" % api),
getattr(FLAGS, "%s_host" % api))) config.get('listen', '0.0.0.0')))
if len(apps) == 0: if len(apps) == 0:
LOG.error(_("No known API applications configured in %s."), LOG.error(_("No known API applications configured in %s."),
paste_config_file) paste_config_file)

4
bin/nova-combined
View File

@@ -67,11 +67,11 @@ if __name__ == '__main__':
continue continue
wsgi.paste_config_to_flags(config, { wsgi.paste_config_to_flags(config, {
"verbose": FLAGS.verbose, "verbose": FLAGS.verbose,
"%s_host" % api: config.get('host', '0.0.0.0'), "%s_host" % api: getattr(FLAGS, "%s_host" % api),
"%s_port" % api: getattr(FLAGS, "%s_port" % api)}) "%s_port" % api: getattr(FLAGS, "%s_port" % api)})
app = wsgi.load_paste_app(paste_config_file, api) app = wsgi.load_paste_app(paste_config_file, api)
apps.append((app, getattr(FLAGS, "%s_port" % api), apps.append((app, getattr(FLAGS, "%s_port" % api),
getattr(FLAGS, "%s_host" % api))) config.get('listen', '0.0.0.0')))
if len(apps) > 0: if len(apps) > 0:
logging.basicConfig() logging.basicConfig()
server = wsgi.Server() server = wsgi.Server()