diff options
| author | Ryan Lane <laner@controller> | 2010-11-24 15:46:22 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-11-24 15:46:22 +0000 |
| commit | 7d462fd04cf799689bcbea0b926f0bd38e64869c (patch) | |
| tree | 1e032a18194694783dfe5475a782a56a75c746d0 /bin | |
| parent | ebffd9cb35af4257a085f85abf64e0c2baf31ff0 (diff) | |
| parent | 6e349f6ea1846c104f620aa68a26cfc753e8977d (diff) | |
| download | nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.tar.gz nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.tar.xz nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.zip | |
Merge from main branch
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() |