From 6000cd2950935636faf23479ea92187fdd468c1f Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Sun, 31 May 2015 11:16:00 -0500 Subject: [PATCH] Update sample config file The sample config file was out of date. Change-Id: I69bf8c6025e70c567c09326073bd1d0d1861a68b --- etc/keystone.conf.sample | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 1b83f09684..f66fef9c1d 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -141,13 +141,15 @@ #log_dir = # Use syslog for logging. Existing syslog format is DEPRECATED during I, and -# will change in J to honor RFC5424. (boolean value) +# changed in J to honor RFC5424. (boolean value) #use_syslog = false # (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, # prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The -# format without the APP-NAME is deprecated in K, and will be removed in L, +# format without the APP-NAME is deprecated in K, and will be removed in M, # along with this option. (boolean value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. #use_syslog_rfc_format = true # Syslog facility to receive log lines. (string value) @@ -166,7 +168,7 @@ #logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d # Prefix each line of exception output with this format. (string value) -#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s +#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s # List of logger=LEVEL pairs. (list value) #default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN @@ -185,10 +187,16 @@ # value) #instance_uuid_format = "[instance: %(uuid)s] " +# Enables or disables fatal status of deprecations. (boolean value) +#fatal_deprecations = false + # # From oslo.messaging # +# Size of RPC connection pool. (integer value) +#rpc_conn_pool_size = 30 + # ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. # The "host" option should point or resolve to this address. (string value) #rpc_zmq_bind_address = * @@ -227,7 +235,7 @@ #rpc_thread_pool_size = 64 # The Drivers(s) to handle sending notifications. Possible values are -# messaging, messagingv2, routing,log, test, noop (multi valued) +# messaging, messagingv2, routing, log, test, noop (multi valued) #notification_driver = # AMQP topic used for OpenStack notifications. (list value) @@ -580,6 +588,9 @@ # From keystone # +# Enable endpoint_policy functionality. (boolean value) +#enabled = true + # Endpoint policy backend driver (string value) #driver = sql @@ -1244,7 +1255,7 @@ # From keystone # -# Credential backend driver. (string value) +# OAuth backend driver. (string value) #driver = sql # Duration (in seconds) for the OAuth Request Token. (integer value) @@ -1331,10 +1342,6 @@ # Deprecated group/name - [DEFAULT]/amqp_auto_delete #amqp_auto_delete = false -# Size of RPC connection pool. (integer value) -# Deprecated group/name - [DEFAULT]/rpc_conn_pool_size -#rpc_conn_pool_size = 30 - # Qpid broker hostname. (string value) # Deprecated group/name - [DEFAULT]/qpid_hostname #qpid_hostname = localhost @@ -1398,10 +1405,6 @@ # Deprecated group/name - [DEFAULT]/amqp_auto_delete #amqp_auto_delete = false -# Size of RPC connection pool. (integer value) -# Deprecated group/name - [DEFAULT]/rpc_conn_pool_size -#rpc_conn_pool_size = 30 - # SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and # SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some # distributions. (string value) @@ -1476,8 +1479,9 @@ #rabbit_ha_queues = false # Number of seconds after which the Rabbit broker is considered down if -# heartbeat's keep-alive fails (0 disable the heartbeat). (integer value) -#heartbeat_timeout_threshold = 60 +# heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL (integer +# value) +#heartbeat_timeout_threshold = 0 # How often times during the heartbeat_timeout_threshold we check the # heartbeat. (integer value)