From 7471586dd6106304770d53553370d868095f0676 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 18 Dec 2012 17:39:56 +0100 Subject: [PATCH] Pass a dict configuration file to auth_keystone This fixes bug #1091754 Change-Id: Iff76a2b499d69fc90c31a23e9c79b1b91f63653e Signed-off-by: Julien Danjou --- bin/ceilometer-api-v2 | 2 +- ceilometer/api/v1/app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ceilometer-api-v2 b/bin/ceilometer-api-v2 index 3b650a542..a8c8934b4 100755 --- a/bin/ceilometer-api-v2 +++ b/bin/ceilometer-api-v2 @@ -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) diff --git a/ceilometer/api/v1/app.py b/ceilometer/api/v1/app.py index 8ab780685..a432068bc 100644 --- a/ceilometer/api/v1/app.py +++ b/ceilometer/api/v1/app.py @@ -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