From c7eae70e1fd72eacca36a4baf08325dd00957f2c Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 16 May 2012 09:23:00 -0400
Subject: Add s3_listen and s3_listen_port options.

Adds s3_listen and s3_listen_port options to the Nova Objectstore
service so that it matches config options from other Nova API services.

Fixes LP Bug #1000220.

Change-Id: Ie6d89af7fc8de0c5cef846315171d0f9c9e3db35
---
 etc/nova/nova.conf.sample    |  4 ++++
 nova/objectstore/s3server.py | 20 ++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 02ccf265d..fd259c782 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -917,6 +917,10 @@
 
 ###### (StrOpt) path to s3 buckets
 # buckets_path="$state_path/buckets"
+###### (StrOpt) IP address for S3 API to listen
+# s3_listen="0.0.0.0"
+###### (IntOpt) port for s3 api to listen
+# s3_listen_port=3333
 
 ######### defined in nova.rpc.common #########
 
diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py
index f19c8826e..e2590a4af 100644
--- a/nova/objectstore/s3server.py
+++ b/nova/objectstore/s3server.py
@@ -45,24 +45,32 @@ import routes
 import webob
 
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
 from nova import utils
 from nova import wsgi
 
 
-buckets_path_opt = cfg.StrOpt('buckets_path', default='$state_path/buckets',
-                              help='path to s3 buckets')
+s3_opts = [
+    cfg.StrOpt('buckets_path',
+               default='$state_path/buckets',
+               help='path to s3 buckets'),
+    cfg.StrOpt('s3_listen',
+               default="0.0.0.0",
+               help='IP address for S3 API to listen'),
+    cfg.IntOpt('s3_listen_port',
+               default=3333,
+               help='port for s3 api to listen'),
+]
 
 FLAGS = flags.FLAGS
-FLAGS.register_opt(buckets_path_opt)
+FLAGS.register_opts(s3_opts)
 
 
 def get_wsgi_server():
     return wsgi.Server("S3 Objectstore",
                        S3Application(FLAGS.buckets_path),
-                       port=FLAGS.s3_port,
-                       host=FLAGS.s3_host)
+                       port=FLAGS.s3_listen_port,
+                       host=FLAGS.s3_listen)
 
 
 class S3Application(wsgi.Router):
-- 
cgit