From 6660fe11bb851a313101c3e763e72606b0dadfaf 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 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index d40adfb..8cbb149 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -130,10 +130,11 @@
 # 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)
@@ -156,7 +157,7 @@
 #syslog_log_facility = LOG_USER
 
 # Log output to standard error. (boolean value)
-#use_stderr = true
+#use_stderr = false
 
 # Format string to use for log messages with context. (string value)
 #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
@@ -368,7 +369,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
 
 # Catalog backend driver. (string value)
 #driver = sql
@@ -475,7 +476,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 SQLAlchemy connection string to use to connect to the slave database.
 # (string value)
@@ -1562,7 +1563,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]