Skip to content

Commit

Permalink
Pass a dict configuration file to auth_keystone
Browse files Browse the repository at this point in the history
This fixes bug #1091754

Change-Id: Iff76a2b499d69fc90c31a23e9c79b1b91f63653e
Signed-off-by: Julien Danjou <julien@danjou.info>
  • Loading branch information
jd committed Dec 28, 2012
1 parent 652bd98 commit 7471586
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/ceilometer-api-v2
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ceilometer/api/v1/app.py
Expand Up @@ -55,7 +55,7 @@ def attach_storage():

# Install the middleware wrapper
if enable_acl:
return acl.install(app, cfg.CONF)
return acl.install(app, dict(cfg.CONF))
return app

# For documentation
Expand Down

0 comments on commit 7471586

Please sign in to comment.