openstack/aodh
Code Issues Proposed changes

Merge "Pass a dict configuration file to auth_keystone"

Browse Source
This commit is contained in:
Jenkins 2012-12-28 17:05:45 +00:00 committed by Gerrit Code Review
commit ade5b235b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ceilometer-api-v2
View File

@ -49,7 +49,7 @@ if __name__ == '__main__':
# Build the WSGI app
root = app.setup_app(pecan_config,
extra_hooks=[acl.AdminAuthHook()])
root = acl.install(root, cfg.CONF)
root = acl.install(root, dict(cfg.CONF))
# Create the WSGI server and start it
host, port = '0.0.0.0', int(cfg.CONF.metering_api_port)

2
ceilometer/api/v1/app.py
View File

@ -55,7 +55,7 @@ def make_app(enable_acl=True, attach_storage=True):
# Install the middleware wrapper
if enable_acl:
return acl.install(app, cfg.CONF)
return acl.install(app, dict(cfg.CONF))
return app
# For documentation