Merge "Consolidate configuration options"

senlin/api/common/wsgi.py

@@ -114,7 +114,7 @@ json_size_opt = cfg.IntOpt('max_json_body_size', default=1048576,
 cfg.CONF.register_opt(json_size_opt)
 
 
-def list_opts():
+def wsgi_opts():
     yield None, [json_size_opt]
     yield paste_deploy_group.name, paste_deploy_opts
     yield api_group.name, api_opts

senlin/common/config.py

@@ -17,6 +17,7 @@ import socket
 
 from oslo_config import cfg
 
+from senlin.api.common import wsgi
 from senlin.common.i18n import _
 
 
@@ -159,6 +160,8 @@ cfg.CONF.register_opts(webhook_opts, group=webhook_group)
 
 
 def list_opts():
+    for g, o in wsgi.wsgi_opts():
+        yield g, o
     yield None, cloud_backend_opts
     yield None, rpc_opts
     yield None, engine_opts

setup.cfg

@@ -30,7 +30,6 @@ console_scripts =
     senlin-manage = senlin.cmd.manage:main
 
 oslo.config.opts =
-    senlin.api.common.wsgi = senlin.api.common.wsgi:list_opts
     senlin.common.config = senlin.common.config:list_opts
 
 senlin.profiles =

tools/config-generator.conf

@@ -2,7 +2,6 @@
 output_file = etc/senlin/senlin.conf.sample
 wrap_width = 119
 namespace = senlin.common.config
-namespace = senlin.api.common.wsgi
 namespace = keystonemiddleware.auth_token
 namespace = oslo.db
 namespace = oslo.log