Merge lp:~eday/nova/lp613264 into lp:~hudson-openstack/nova/trunk

[Eric Day]

Allows user to specify hosts to listen on for nova-api and -objectstore

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Soren Hansen (soren)]

On 03-11-2010 20:44, Eric Day wrote:
> === modified file 'bin/nova-api'
> --- bin/nova-api 2010-11-02 18:28:14 +0000
> +++ bin/nova-api 2010-11-03 19:44:44 +0000
> @@ -38,15 +38,17 @@
>
> FLAGS = flags.FLAGS
> flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
> +flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
> flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
> +flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')

Perhaps we should add a note about being ipv4-only (not your fault,
eventlet seems to be that way by default anyway (eventlet.listen has a
kwarg defining the address family. It defaults to 2 (AF_INET))).

> === modified file 'nova/objectstore/handler.py'
> --- nova/objectstore/handler.py 2010-10-25 10:21:09 +0000
> +++ nova/objectstore/handler.py 2010-11-03 19:44:44 +0000
> @@ -438,6 +438,7 @@
> # Disabled because of lack of proper introspection in Twisted
> # or possibly different versions of twisted?
> # pylint: disable-msg=E1101
> - objectStoreService = internet.TCPServer(FLAGS.s3_port, factory)
> + objectStoreService = internet.TCPServer(FLAGS.s3_port, factory,
> + interface=FLAGS.s3_host)
> objectStoreService.setServiceParent(application)
> return application

This will effectively make the objectstore listen only on the loopback
device by default and only work on ipv4. Setting interface to '' instead
will make it listen on whatever.

  vote needsfixing

--
Soren Hansen
Ubuntu Developer http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

review: Needs Fixing

[Eric Day (eday)]

I used the s3_host since I figure folks would be setting this in all areas (connect and listen) to match. I separated the two so we have a connect and a listen option now. As var as IPv6, these are just a couple of many places where ipv4 is assumed. One of the summit blueprints is to address ipv6 support, so we can tackle those issues then.

[Devin Carlen (devcamcar)]

good good

review: Approve

[Soren Hansen (soren)]

Alright. Only listening on loopback might even be a feature.

review: Approve

=== modified file 'bin/nova-api'
--- bin/nova-api	2010-11-02 18:28:14 +0000
+++ bin/nova-api	2010-11-03 20:16:12 +0000
@@ -38,15 +38,17 @@
 
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
+flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
 flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
+flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
 def main(_args):
     from nova import api
     from nova import wsgi
     server = wsgi.Server()
-    server.start(api.API('os'), FLAGS.osapi_port)
-    server.start(api.API('ec2'), FLAGS.ec2api_port)
+    server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
+    server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
     server.wait()
 
 
 
=== modified file 'nova/objectstore/handler.py'
--- nova/objectstore/handler.py	2010-10-25 10:21:09 +0000
+++ nova/objectstore/handler.py	2010-11-03 20:16:12 +0000
@@ -61,6 +61,7 @@
 
 
 FLAGS = flags.FLAGS
+flags.DEFINE_string('s3_listen_host', '', 'Host to listen on.')
 
 
 def render_xml(request, value):
@@ -438,6 +439,7 @@
     # Disabled because of lack of proper introspection in Twisted
     # or possibly different versions of twisted?
     # pylint: disable-msg=E1101
-    objectStoreService = internet.TCPServer(FLAGS.s3_port, factory)
+    objectStoreService = internet.TCPServer(FLAGS.s3_port, factory,
+                                            interface=FLAGS.s3_listen_host)
     objectStoreService.setServiceParent(application)
     return application