Consolidate configuration options
Consolidate all senlin configuration options into a single module. Change-Id: I8a2d3121c7beca162280a7409babe4d9866527fb
This commit is contained in:
parent
55b6b76c29
commit
b2c5a2c3cd
@ -114,7 +114,7 @@ json_size_opt = cfg.IntOpt('max_json_body_size', default=1048576,
|
|||||||
cfg.CONF.register_opt(json_size_opt)
|
cfg.CONF.register_opt(json_size_opt)
|
||||||
|
|
||||||
|
|
||||||
def list_opts():
|
def wsgi_opts():
|
||||||
yield None, [json_size_opt]
|
yield None, [json_size_opt]
|
||||||
yield paste_deploy_group.name, paste_deploy_opts
|
yield paste_deploy_group.name, paste_deploy_opts
|
||||||
yield api_group.name, api_opts
|
yield api_group.name, api_opts
|
||||||
|
@ -17,6 +17,7 @@ import socket
|
|||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
from senlin.api.common import wsgi
|
||||||
from senlin.common.i18n import _
|
from senlin.common.i18n import _
|
||||||
|
|
||||||
|
|
||||||
@ -159,6 +160,8 @@ cfg.CONF.register_opts(webhook_opts, group=webhook_group)
|
|||||||
|
|
||||||
|
|
||||||
def list_opts():
|
def list_opts():
|
||||||
|
for g, o in wsgi.wsgi_opts():
|
||||||
|
yield g, o
|
||||||
yield None, cloud_backend_opts
|
yield None, cloud_backend_opts
|
||||||
yield None, rpc_opts
|
yield None, rpc_opts
|
||||||
yield None, engine_opts
|
yield None, engine_opts
|
||||||
|
@ -30,7 +30,6 @@ console_scripts =
|
|||||||
senlin-manage = senlin.cmd.manage:main
|
senlin-manage = senlin.cmd.manage:main
|
||||||
|
|
||||||
oslo.config.opts =
|
oslo.config.opts =
|
||||||
senlin.api.common.wsgi = senlin.api.common.wsgi:list_opts
|
|
||||||
senlin.common.config = senlin.common.config:list_opts
|
senlin.common.config = senlin.common.config:list_opts
|
||||||
|
|
||||||
senlin.profiles =
|
senlin.profiles =
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
output_file = etc/senlin/senlin.conf.sample
|
output_file = etc/senlin/senlin.conf.sample
|
||||||
wrap_width = 119
|
wrap_width = 119
|
||||||
namespace = senlin.common.config
|
namespace = senlin.common.config
|
||||||
namespace = senlin.api.common.wsgi
|
|
||||||
namespace = keystonemiddleware.auth_token
|
namespace = keystonemiddleware.auth_token
|
||||||
namespace = oslo.db
|
namespace = oslo.db
|
||||||
namespace = oslo.log
|
namespace = oslo.log
|
||||||
|
Loading…
Reference in New Issue
Block a user