diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-07 03:32:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-07 03:32:15 +0000 |
| commit | 81688cb606d0634323a201da7a67249aa9db2967 (patch) | |
| tree | 679b0eedb3b057633a1b6808bf971f669bebe447 | |
| parent | be23b796a35a6f93361c6e37d4af915bb98b05da (diff) | |
| parent | ddd221630af049b577479d7f7ec0da8755b2a517 (diff) | |
| download | keystone-81688cb606d0634323a201da7a67249aa9db2967.tar.gz keystone-81688cb606d0634323a201da7a67249aa9db2967.tar.xz keystone-81688cb606d0634323a201da7a67249aa9db2967.zip | |
Merge "Move auth plugins to 'keystone.auth.plugins' (bug 1136967)"
| -rw-r--r-- | etc/keystone.conf.sample | 4 | ||||
| -rw-r--r-- | keystone/auth/plugins/__init__.py (renamed from keystone/auth/methods/__init__.py) | 0 | ||||
| -rw-r--r-- | keystone/auth/plugins/password.py (renamed from keystone/auth/methods/password.py) | 0 | ||||
| -rw-r--r-- | keystone/auth/plugins/token.py (renamed from keystone/auth/methods/token.py) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 808cff75..f9d8cc60 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -202,8 +202,8 @@ [auth] methods = password,token -password = keystone.auth.methods.password.Password -token = keystone.auth.methods.token.Token +password = keystone.auth.plugins.password.Password +token = keystone.auth.plugins.token.Token [filter:debug] paste.filter_factory = keystone.common.wsgi:Debug.factory diff --git a/keystone/auth/methods/__init__.py b/keystone/auth/plugins/__init__.py index e69de29b..e69de29b 100644 --- a/keystone/auth/methods/__init__.py +++ b/keystone/auth/plugins/__init__.py diff --git a/keystone/auth/methods/password.py b/keystone/auth/plugins/password.py index 46ae6cb9..46ae6cb9 100644 --- a/keystone/auth/methods/password.py +++ b/keystone/auth/plugins/password.py diff --git a/keystone/auth/methods/token.py b/keystone/auth/plugins/token.py index bb7b8d58..bb7b8d58 100644 --- a/keystone/auth/methods/token.py +++ b/keystone/auth/plugins/token.py |