summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2011-02-18 16:21:14 +0100
committerThierry Carrez <thierry@openstack.org>2011-02-18 16:21:14 +0100
commit27c2de313a41bced77f7a4769deae089a70f5385 (patch)
treea3f1ebe52ec278d5ae9d033ba95fdfbeda8dcb41 /bin/nova-api
parenta0145eed239a7afb545def17f25a08e8e4c68824 (diff)
downloadnova-27c2de313a41bced77f7a4769deae089a70f5385.tar.gz
nova-27c2de313a41bced77f7a4769deae089a70f5385.tar.xz
nova-27c2de313a41bced77f7a4769deae089a70f5385.zip
Port changes to nova-combined, rename flags to API_listen and API_listen_port
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 46f695248..8d47a656e 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -44,9 +44,9 @@ FLAGS = flags.FLAGS
API_ENDPOINTS = ['ec2', 'osapi']
for api in API_ENDPOINTS:
- flags.DEFINE_string("%s_api_listen" % api, "0.0.0.0",
+ flags.DEFINE_string("%s_listen" % api, "0.0.0.0",
"IP address to listen to for API %s" % api)
- flags.DEFINE_integer("%s_api_listen_port" % api,
+ flags.DEFINE_integer("%s_listen_port" % api,
getattr(FLAGS, "%s_port" % api),
"Port to listen to for API %s" % api)
@@ -61,8 +61,8 @@ def run_app(paste_config_file):
LOG.debug(_("App Config: %(api)s\n%(config)r") % locals())
LOG.info(_("Running %s API"), api)
app = wsgi.load_paste_app(paste_config_file, api)
- apps.append((app, getattr(FLAGS, "%s_api_listen_port" % api),
- getattr(FLAGS, "%s_api_listen" % api)))
+ apps.append((app, getattr(FLAGS, "%s_listen_port" % api),
+ getattr(FLAGS, "%s_listen" % api)))
if len(apps) == 0:
LOG.error(_("No known API applications configured in %s."),
paste_config_file)