From fcab54b67a2221b66bb48da522a3d6fa9f6ec39e Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Fri, 26 Oct 2012 14:47:34 -0700
Subject: 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
---
 etc/keystone.conf.sample | 3 +--
 1 file changed, 1 insertion(+), 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
-- 
cgit