diff options
author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-03-20 14:22:36 -0400 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-04-09 23:51:11 +0000 |
commit | cbac77110ee1d7b9abc5a23f973dab27e8b32015 (patch) | |
tree | 0015ec9a32c9bfae5b31bbfb4d99f2349fd5ea75 /keystone/auth | |
parent | c1eac10cc36a2cb612be39819337f0b819f39f58 (diff) | |
download | keystone-cbac77110ee1d7b9abc5a23f973dab27e8b32015.tar.gz keystone-cbac77110ee1d7b9abc5a23f973dab27e8b32015.tar.xz keystone-cbac77110ee1d7b9abc5a23f973dab27e8b32015.zip |
Fix for configuring non-default auth plugins properly
Make sure we pick up CONF.auth.methods from configuration
files. Added a test case to make sure the we don't regress
Fixes LP# 1157515
Change-Id: I70290c37b2a5378b5247a14e3bfa20d50bf8fe74
Diffstat (limited to 'keystone/auth')
-rw-r--r-- | keystone/auth/controllers.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index 113655db..67a86442 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -277,6 +277,7 @@ class Auth(controller.V3Controller): def __init__(self, *args, **kw): super(Auth, self).__init__(*args, **kw) self.token_controllers_ref = token.controllers.Auth() + config.setup_authentication() def authenticate_for_token(self, context, auth=None): """ Authenticate user and issue a token. """ |