summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorEric Day <eday@oddments.org>2010-11-02 11:28:14 -0700
committerEric Day <eday@oddments.org>2010-11-02 11:28:14 -0700
commit2e2dce7ebf478258f67a9122c6b158ba5e89c1ed (patch)
tree40890f3fb7166717d27d2d6fa679133d0df1da5e /bin/nova-api
parentab1c34f71745b901f40fd6a72dffc7a29a864990 (diff)
Added support for OpenStack and EC2 APIs to run on different ports.
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api9
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()