summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorGabriel Hurley <gabriel@strikeawe.com>2012-10-26 14:47:34 -0700
committerGabriel Hurley <gabriel@strikeawe.com>2012-10-26 14:47:34 -0700
commitfcab54b67a2221b66bb48da522a3d6fa9f6ec39e (patch)
treebbaa85bb32a8ae8299638715f250a21e2fe9341a /etc
parent9916ef7b86cca98014355b1b90a7dbe36b51af2d (diff)
downloadkeystone-fcab54b67a2221b66bb48da522a3d6fa9f6ec39e.tar.gz
keystone-fcab54b67a2221b66bb48da522a3d6fa9f6ec39e.tar.xz
keystone-fcab54b67a2221b66bb48da522a3d6fa9f6ec39e.zip
Removes duplicate flag for token_format.
The token_format settings defaults to PKI, but both the "PKI" and "UUID" lines were still in the sample config file. This patch removes the duplicate and leaves only the correct default. Change-Id: Ib8560952ec2aee6d6b6eda944c6ec1f96fdc5c4c
Diffstat (limited to 'etc')
-rw-r--r--etc/keystone.conf.sample3
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index 2eabba41..da0b5128 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -92,14 +92,13 @@
#cert_required = True
[signing]
-#token_format = UUID
+#token_format = PKI
#certfile = /etc/keystone/ssl/certs/signing_cert.pem
#keyfile = /etc/keystone/ssl/private/signing_key.pem
#ca_certs = /etc/keystone/ssl/certs/ca.pem
#key_size = 1024
#valid_days = 3650
#ca_password = None
-#token_format = PKI
[ldap]
# url = ldap://localhost