diff options
| author | Todd Willey <todd@ansolabs.com> | 2010-11-02 18:09:52 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2010-11-02 18:09:52 -0400 |
| commit | fbb82a4c2b832f9e6c86aacb664a7f1a9060e2ce (patch) | |
| tree | ec190589b9a2907dc6da2971ab50e3af5f566efc /bin | |
| parent | e493e324eb9a9fe31e72551b34bab768b507bc1d (diff) | |
| parent | 56c7e7763fc07f26be40bb8c0c702fc9afe8b1e3 (diff) | |
Merge trunk.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index 20f1bd74f..a9002ae2d 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -37,13 +37,18 @@ 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_integer('ec2api_port', 8773, 'EC2 API port') 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) + server.start(api.API('ec2'), FLAGS.ec2api_port) + server.wait() + if __name__ == '__main__': utils.default_flagfile() |