From dc539d8b2dd41d8742eae7ff47e6ecec6d6256c6 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Mon, 9 Sep 2013 15:22:20 +0200
Subject: [PATCH] sync parameter values with keystone-dist.conf

and adjust descriptions to take dist.conf defaults into account (rhbz#923912)

Change-Id: If36c384f86843a6506a494d79beca65639fb3480
---
 etc/keystone.conf.sample | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index c5f57bf..3aa1314 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -385,7 +385,7 @@
 #verbose=false
 
 # Log output to standard error (boolean value)
-#use_stderr=true
+#use_stderr=false
 
 # Format string to use for log messages with context (string
 # value)
@@ -439,10 +439,11 @@
 # %(default)s (string value)
 #log_date_format=%Y-%m-%d %H:%M:%S
 
-# (Optional) Name of log file to output to. If no default is
-# set, logging will go to stdout. (string value)
+# (Optional) Name of log file to output to. (string value)
+# If not set here, logging will go to /var/log/keystone/keystone.log,
+# default from keystone-dist.conf.
 # Deprecated group/name - [DEFAULT]/logfile
-#log_file=<None>
+#log_file=/var/log/keystone/keystone.log
 
 # (Optional) The base directory used for relative --log-file
 # paths (string value)
@@ -581,7 +582,7 @@
 
 # Catalog template file name for use with the template catalog
 # backend. (string value)
-#template_file=default_catalog.templates
+#template_file=/etc/keystone/default_catalog.templates
 
 # Keystone catalog backend driver. (string value)
 #driver=keystone.catalog.backends.sql.Catalog
@@ -622,7 +623,7 @@
 # Deprecated group/name - [DEFAULT]/sql_connection
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
-#connection=<None>
+#connection=mysql://keystone:keystone@localhost/keystone
 
 # The SQL mode to be used for MySQL sessions. This option,
 # including the default, overrides any server-set SQL mode. To
@@ -710,7 +711,7 @@
 #
 
 # Keystone EC2Credential backend driver. (string value)
-#driver=keystone.contrib.ec2.backends.kvs.Ec2
+#driver=keystone.contrib.ec2.backends.sql.Ec2
 
 
 [endpoint_filter]
@@ -1147,7 +1148,7 @@
 
 # Name of the paste configuration file that defines the
 # available pipelines. (string value)
-#config_file=keystone-paste.ini
+#config_file=/usr/share/keystone/keystone-dist-paste.ini
 
 
 [policy]