diff options
| author | Eric Day <eday@oddments.org> | 2010-11-03 12:38:15 -0700 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-11-03 12:38:15 -0700 |
| commit | 60c82177da9c4ebbb89e5534959d0d5a52bfa49a (patch) | |
| tree | ebe1d25154d711e1d56f1fdd0aeb80ad9ec569e4 | |
| parent | 2baf2127110929fb834042238058802dae8d725e (diff) | |
Fix for bug#613264, allowing hosts to be specified for nova-api and objectstore listeners.
| -rwxr-xr-x | bin/nova-api | 6 | ||||
| -rw-r--r-- | nova/objectstore/handler.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/nova-api b/bin/nova-api index a9002ae2d..a9c53dbcd 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -38,15 +38,17 @@ from nova import server 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() diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index b26906001..aaf207db4 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -438,6 +438,7 @@ def get_application(): # 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 |