From b2c5a2c3cdc063c31edcca2dd7eab5a491013e2b Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Sat, 23 Jul 2016 06:54:56 -0400
Subject: [PATCH] Consolidate configuration options

Consolidate all senlin configuration options into a single module.

Change-Id: I8a2d3121c7beca162280a7409babe4d9866527fb
---
 senlin/api/common/wsgi.py   | 2 +-
 senlin/common/config.py     | 3 +++
 setup.cfg                   | 1 -
 tools/config-generator.conf | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/senlin/api/common/wsgi.py b/senlin/api/common/wsgi.py
index 04cf1b7e7..83e298d0c 100644
--- a/senlin/api/common/wsgi.py
+++ b/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
diff --git a/senlin/common/config.py b/senlin/common/config.py
index bc578e73c..8507ed77d 100644
--- a/senlin/common/config.py
+++ b/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
diff --git a/setup.cfg b/setup.cfg
index f6c4b4ba9..f3013cbf6 100644
--- a/setup.cfg
+++ b/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 =
diff --git a/tools/config-generator.conf b/tools/config-generator.conf
index 634ef53a9..328aceb5a 100644
--- a/tools/config-generator.conf
+++ b/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