openstack/aodh
Code Issues Proposed changes

Move enable_acl and debug config to ceilometer.conf

Browse Source 
These user editable config params are moved from
pecan config to ceilometer.conf

Change-Id: I8686987e5d92e38e2a9cfbd3f35eea0cc2b443c5
Closes-bug: #1256111
This commit is contained in:
Balazs Gibizer 2014-01-21 17:34:23 +01:00
parent ed4bad9af7
commit b33c47bdfb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/api/app.py
View File

@ -81,7 +81,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
guess_content_type_from_ext=False 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 acl.install(app, cfg.CONF)
return app return app
@ -90,6 +90,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
class VersionSelectorApplication(object): class VersionSelectorApplication(object):
def __init__(self): def __init__(self):
pc = get_pecan_config() pc = get_pecan_config()
pc.app.debug = CONF.debug
pc.app.enable_acl = (CONF.auth_strategy == 'keystone') pc.app.enable_acl = (CONF.auth_strategy == 'keystone')
if cfg.CONF.enable_v1_api: if cfg.CONF.enable_v1_api:
from ceilometer.api.v1 import app as v1app from ceilometer.api.v1 import app as v1app

2
ceilometer/api/config.py
View File

@ -22,8 +22,6 @@ app = {
'modules': ['ceilometer.api'], 'modules': ['ceilometer.api'],
'static_root': '%(confdir)s/public', 'static_root': '%(confdir)s/public',
'template_path': '%(confdir)s/ceilometer/api/templates', 'template_path': '%(confdir)s/ceilometer/api/templates',
'debug': False,
'enable_acl': True,
} }
# Custom Configurations must be in Python dictionary format:: # Custom Configurations must be in Python dictionary format::