diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-02-22 15:34:47 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-22 15:34:47 +0000 |
| commit | f9f9bf52f50604afa05fdd7300601f28d7b441c0 (patch) | |
| tree | b7713634c5565061eae016ee1942c76a277ed9b0 /bin/nova-api | |
| parent | e18f708135d7a9b0cf465ecc8df1b32252de6705 (diff) | |
| parent | 3125d978fec27608064dd3dd8d3696f2219fbf12 (diff) | |
| download | nova-f9f9bf52f50604afa05fdd7300601f28d7b441c0.tar.gz nova-f9f9bf52f50604afa05fdd7300601f28d7b441c0.tar.xz nova-f9f9bf52f50604afa05fdd7300601f28d7b441c0.zip | |
Add flags for listen_port to nova-api. This allows us to listen on one port, but return another port (for a proxy or load balancer) in calls like describe_regions, etc.
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index 61a4c7402..5e569dbaa 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -42,6 +42,8 @@ from nova import wsgi LOG = logging.getLogger('nova.api') FLAGS = flags.FLAGS +flags.DEFINE_integer('ec2_listen_port', 8773, 'port for ec2 api to listen') +flags.DEFINE_integer('osapi_listen_port', 8774, 'port for os api to listen') API_ENDPOINTS = ['ec2', 'osapi'] @@ -58,10 +60,10 @@ def run_app(paste_config_file): wsgi.paste_config_to_flags(config, { "verbose": FLAGS.verbose, "%s_host" % api: config.get('host', '0.0.0.0'), - "%s_port" % api: getattr(FLAGS, "%s_port" % api)}) + "%s_listen_port" % api: getattr(FLAGS, "%s_listen_port" % api)}) LOG.info(_("Running %s API"), api) app = wsgi.load_paste_app(paste_config_file, api) - apps.append((app, getattr(FLAGS, "%s_port" % api), + apps.append((app, getattr(FLAGS, "%s_listen_port" % api), getattr(FLAGS, "%s_host" % api))) if len(apps) == 0: LOG.error(_("No known API applications configured in %s."), |