summaryrefslogtreecommitdiffstats
path: root/keystone/config.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-24 16:56:34 +0000
committerGerrit Code Review <review@openstack.org>2012-10-24 16:56:34 +0000
commite9ed35197be561bceb764b8f38173156b4719729 (patch)
tree7f42f012d2cb517ba24aeac10df2bdcafe4c7d1d /keystone/config.py
parent19224bddb30fa135c0cb0cedf8f0bd04103f3433 (diff)
parent9079af7190433dab76b4758b78adad36be867560 (diff)
downloadkeystone-e9ed35197be561bceb764b8f38173156b4719729.tar.gz
keystone-e9ed35197be561bceb764b8f38173156b4719729.tar.xz
keystone-e9ed35197be561bceb764b8f38173156b4719729.zip
Merge "making PKI default token type"
Diffstat (limited to 'keystone/config.py')
-rw-r--r--keystone/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/config.py b/keystone/config.py
index 86a425ec..bfded4ec 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -139,7 +139,7 @@ register_str('ca_certs', group='ssl', default=None)
register_bool('cert_required', group='ssl', default=False)
#signing options
register_str('token_format', group='signing',
- default="UUID")
+ default="PKI")
register_str('certfile', group='signing',
default="/etc/keystone/ssl/certs/signing_cert.pem")
register_str('keyfile', group='signing',