diff options
| author | Thierry Carrez <thierry@openstack.org> | 2011-02-22 17:16:43 +0100 |
|---|---|---|
| committer | Thierry Carrez <thierry@openstack.org> | 2011-02-22 17:16:43 +0100 |
| commit | f80d4c859b95773b8637f044f975354964ee0989 (patch) | |
| tree | 7059f6f55f3acf4d9a8a08a885723808832eadd4 /bin/nova-api | |
| parent | bf570ca5f199091d505d96b91a3dc3acfbfc9fc7 (diff) | |
| parent | f9f9bf52f50604afa05fdd7300601f28d7b441c0 (diff) | |
Merged trunk
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/nova-api b/bin/nova-api index 1228f723c..d5efb4687 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -39,17 +39,18 @@ from nova import log as logging from nova import version from nova import wsgi +LOG = logging.getLogger('nova.api') + FLAGS = flags.FLAGS +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') +flags.DEFINE_string('osapi_listen', "0.0.0.0", + 'IP address for OpenStack API to listen') +flags.DEFINE_integer('osapi_listen_port', 8774, 'port for os api to listen') API_ENDPOINTS = ['ec2', 'osapi'] -for api in API_ENDPOINTS: - flags.DEFINE_string("%s_listen" % api, "0.0.0.0", - "IP address to listen to for API %s" % api) - flags.DEFINE_integer("%s_listen_port" % api, - getattr(FLAGS, "%s_port" % api), - "Port to listen to for API %s" % api) - def run_app(paste_config_file): LOG.debug(_("Using paste.deploy config at: %s"), paste_config_file) @@ -77,8 +78,7 @@ def run_app(paste_config_file): if __name__ == '__main__': FLAGS(sys.argv) - logging.basicConfig() - LOG = logging.getLogger('nova.api') + logging.setup() LOG.audit(_("Starting nova-api node (version %s)"), version.version_string_with_vcs()) LOG.debug(_("Full set of FLAGS:")) |