diff options
| author | Ryan Lane <laner@controller> | 2010-11-24 15:46:32 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-11-24 15:46:32 +0000 |
| commit | 6416210aae86d41a2f0175ce3715bafa8313f8fb (patch) | |
| tree | 202b4725b38677b13bb868c38335c79d57effe9f /bin | |
| parent | 7869876212a192e2f7953bf9ec5cc8200ae7f604 (diff) | |
| parent | 7d462fd04cf799689bcbea0b926f0bd38e64869c (diff) | |
| download | nova-6416210aae86d41a2f0175ce3715bafa8313f8fb.tar.gz nova-6416210aae86d41a2f0175ce3715bafa8313f8fb.tar.xz nova-6416210aae86d41a2f0175ce3715bafa8313f8fb.zip | |
Merge from trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index 20f1bd74f..a9c53dbcd 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -37,13 +37,20 @@ from nova import utils from nova import server FLAGS = flags.FLAGS -flags.DEFINE_integer('api_port', 8773, 'API port') +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 - wsgi.run_server(api.API(), FLAGS.api_port) + server = wsgi.Server() + 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() + if __name__ == '__main__': utils.default_flagfile() |