diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-11-16 13:23:12 -0500 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-11-16 13:23:12 -0500 |
| commit | 1d2bb38ed4d79f7455a5b8b83c652706bdca0489 (patch) | |
| tree | e6521d16e92a7cd25a3d8119c5db1c0845bfa497 /bin | |
| parent | dfe98891b46c4f02f13ea2686979ca7ff4547bd3 (diff) | |
| parent | 06118df7b06a729e918242149119a485b9f25f7e (diff) | |
| download | nova-1d2bb38ed4d79f7455a5b8b83c652706bdca0489.tar.gz nova-1d2bb38ed4d79f7455a5b8b83c652706bdca0489.tar.xz nova-1d2bb38ed4d79f7455a5b8b83c652706bdca0489.zip | |
Merge from 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() |