diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-03-19 17:15:25 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-03-20 10:37:48 -0500 |
| commit | 7db01cd64be2ab3ed5ffc00636d187ef432294b2 (patch) | |
| tree | 05d562d8e66b138116b8753efa5d8195c9abfd57 /keystone/middleware | |
| parent | 5cb8e1f2e5e12cf7e8c6bce91af53b901f6254a9 (diff) | |
| download | keystone-7db01cd64be2ab3ed5ffc00636d187ef432294b2.tar.gz keystone-7db01cd64be2ab3ed5ffc00636d187ef432294b2.tar.xz keystone-7db01cd64be2ab3ed5ffc00636d187ef432294b2.zip | |
Wrap config module and require manual setup (bug 1143998)
This moves keystone.config to keystone.common.config, which requires
.configure() to be called manually in order for options to be
registered.
keystone.config preserves the existing behavior of automatically
registering options when imported.
keystone.middleware.auth_token and it's dependencies within keystone no
longer cause config options to be automatically registered.
This is an alternative to https://review.openstack.org/#/c/24251/
Change-Id: If9eb5799bf77595ecb71f2000f8b6d1610ea9700
Diffstat (limited to 'keystone/middleware')
| -rw-r--r-- | keystone/middleware/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py index 99cba4a0..863ef948 100644 --- a/keystone/middleware/core.py +++ b/keystone/middleware/core.py @@ -16,11 +16,11 @@ import webob.dec +from keystone.common import config from keystone.common import logging from keystone.common import serializer from keystone.common import utils from keystone.common import wsgi -from keystone import config from keystone import exception from keystone.openstack.common import jsonutils |