OpenStack Compute (nova)

Merge lp:~vishvananda/nova/api-listen into lp:~hudson-openstack/nova/trunk

  1. api-listen
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Josh Kearney
Approved revision: 707
Merged at revision: 712
Proposed branch: lp:~vishvananda/nova/api-listen
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 25 lines (+4/-2)
1 file modified
bin/nova-api (+4/-2)
To merge this branch: bzr merge lp:~vishvananda/nova/api-listen
Reviewer Review Type Date Requested Status
Josh Kearney (community) Approve
Devin Carlen (community) Approve
Review via email: mp+50708@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Thierry Carrez (ttx) wrote :

This needs to be duplicated to bin/nova-combined, unless we get rid of it (option 2 preferred)

Revision history for this message
Josh Kearney (jk0) wrote :

lgtm

(I would also like to see nova-combined go away)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/nova-api'
2--- bin/nova-api 2011-01-21 21:10:26 +0000
3+++ bin/nova-api 2011-02-22 07:43:13 +0000
4@@ -44,6 +44,8 @@
5 LOG.setLevel(logging.DEBUG)
6
7 FLAGS = flags.FLAGS
8+flags.DEFINE_integer('ec2_listen_port', 8773, 'port for ec2 api to listen')
9+flags.DEFINE_integer('osapi_listen_port', 8774, 'port for os api to listen')
10
11 API_ENDPOINTS = ['ec2', 'osapi']
12
13@@ -60,10 +62,10 @@
14 wsgi.paste_config_to_flags(config, {
15 "verbose": FLAGS.verbose,
16 "%s_host" % api: config.get('host', '0.0.0.0'),
17- "%s_port" % api: getattr(FLAGS, "%s_port" % api)})
18+ "%s_listen_port" % api: getattr(FLAGS, "%s_listen_port" % api)})
19 LOG.info(_("Running %s API"), api)
20 app = wsgi.load_paste_app(paste_config_file, api)
21- apps.append((app, getattr(FLAGS, "%s_port" % api),
22+ apps.append((app, getattr(FLAGS, "%s_listen_port" % api),
23 getattr(FLAGS, "%s_host" % api)))
24 if len(apps) == 0:
25 LOG.error(_("No known API applications configured in %s."),