diff options
| author | Armando Migliaccio <armando.migliaccio@citrix.com> | 2010-11-25 10:46:58 +0000 |
|---|---|---|
| committer | Armando Migliaccio <armando.migliaccio@citrix.com> | 2010-11-25 10:46:58 +0000 |
| commit | 71c358e69c80cbeb349db94be20a4c8cf2222276 (patch) | |
| tree | d1b01edb17014af89ccbe9e7031824eb114fc417 /bin/nova-api | |
| parent | 9f722a0bcdb987c228f4ebf1e42c904a26d0ef73 (diff) | |
| parent | 07ee9639a105a58b8b212fff607f4e0639d411da (diff) | |
small conflict resolution
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index a9002ae2d..a9c53dbcd 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -38,15 +38,17 @@ from nova import server FLAGS = flags.FLAGS flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port') +flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host') flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port') +flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host') def main(_args): from nova import api from nova import wsgi server = wsgi.Server() - server.start(api.API('os'), FLAGS.osapi_port) - server.start(api.API('ec2'), FLAGS.ec2api_port) + server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host) + server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host) server.wait() |