summaryrefslogtreecommitdiffstats
path: root/keystone/common
diff options
context:
space:
mode:
authorGuang Yee <guang.yee@hp.com>2013-07-18 08:23:52 -0700
committerGuang Yee <guang.yee@hp.com>2013-07-18 09:28:42 -0700
commite63501d305c67b898821ad65ec744adf6851236a (patch)
treea9d3430185972de6f26ff1cef76525f8fc530fa1 /keystone/common
parentc42533fc00210a16d6eb74909adaeddb9bc4fbf6 (diff)
downloadkeystone-e63501d305c67b898821ad65ec744adf6851236a.tar.gz
keystone-e63501d305c67b898821ad65ec744adf6851236a.tar.xz
keystone-e63501d305c67b898821ad65ec744adf6851236a.zip
Support token_format for backward compatibility
The provider property in the [token] section will be unset by default. If provider is not set, we will use token_format in the [signing] section to determine to provider. If provider is set, it must agree with the token_format. fixed bug 1202651 Change-Id: I15ff67490acbbacc9eefc7eee253400475704b04
Diffstat (limited to 'keystone/common')
-rw-r--r--keystone/common/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py
index b6efa738..b0a534f8 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -415,4 +415,4 @@ def configure():
register_str(
'provider',
group='token',
- default='keystone.token.providers.pki.Provider')
+ default=None)