summaryrefslogtreecommitdiffstats
path: root/keystone/token/provider.py
diff options
context:
space:
mode:
Diffstat (limited to 'keystone/token/provider.py')
-rw-r--r--keystone/token/provider.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/keystone/token/provider.py b/keystone/token/provider.py
index 2459f843..2864be6f 100644
--- a/keystone/token/provider.py
+++ b/keystone/token/provider.py
@@ -77,6 +77,10 @@ class Manager(manager.Manager):
'conflicts with keystone.conf [token] provider'))
return CONF.token.provider
else:
+ if not CONF.signing.token_format:
+ # No token provider and no format, so use default (PKI)
+ return PKI_PROVIDER
+
msg = _('keystone.conf [signing] token_format is deprecated in '
'favor of keystone.conf [token] provider')
if CONF.signing.token_format == 'PKI':