diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-02 17:39:51 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-02 17:39:51 -0700 |
| commit | ff967253b28d54ff33176191f6424cb19c444812 (patch) | |
| tree | 1dcc2876e568aa7d3d4165c5f45719d23edfd5d8 /bin | |
| parent | 1119f7e0eeffc0bc2f918b0c5fb8eb87cd3e3784 (diff) | |
| parent | 583d1b1c4d039f1f9751c8a2cc0cf59bb77551e0 (diff) | |
merged
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() |