Move enable_acl and debug config to ceilometer.conf
These user editable config params are moved from pecan config to ceilometer.conf Change-Id: I8686987e5d92e38e2a9cfbd3f35eea0cc2b443c5 Closes-bug: #1256111
This commit is contained in:
parent
ed4bad9af7
commit
b33c47bdfb
@ -81,7 +81,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
|
||||
guess_content_type_from_ext=False
|
||||
)
|
||||
|
||||
if pecan_config.app.enable_acl:
|
||||
if getattr(pecan_config.app, 'enable_acl', True):
|
||||
return acl.install(app, cfg.CONF)
|
||||
|
||||
return app
|
||||
@ -90,6 +90,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
|
||||
class VersionSelectorApplication(object):
|
||||
def __init__(self):
|
||||
pc = get_pecan_config()
|
||||
pc.app.debug = CONF.debug
|
||||
pc.app.enable_acl = (CONF.auth_strategy == 'keystone')
|
||||
if cfg.CONF.enable_v1_api:
|
||||
from ceilometer.api.v1 import app as v1app
|
||||
|
@ -22,8 +22,6 @@ app = {
|
||||
'modules': ['ceilometer.api'],
|
||||
'static_root': '%(confdir)s/public',
|
||||
'template_path': '%(confdir)s/ceilometer/api/templates',
|
||||
'debug': False,
|
||||
'enable_acl': True,
|
||||
}
|
||||
|
||||
# Custom Configurations must be in Python dictionary format::
|
||||
|
Loading…
x
Reference in New Issue
Block a user