diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-11-15 01:26:34 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-11-15 01:26:34 -0400 |
| commit | 18555a55d186d72d1bb2fd806790ef5a31cdfd33 (patch) | |
| tree | 655af1983197faaadfea78315c07b16b09e516cb /bin | |
| parent | 398ec325160acf039e1070718e898339a4b2d268 (diff) | |
| parent | a81547f780afec4eee88e87a301b32c903943c2c (diff) | |
| download | nova-18555a55d186d72d1bb2fd806790ef5a31cdfd33.tar.gz nova-18555a55d186d72d1bb2fd806790ef5a31cdfd33.tar.xz nova-18555a55d186d72d1bb2fd806790ef5a31cdfd33.zip | |
merge with trunk
Diffstat (limited to 'bin')
| -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() |