Merge "Update config sample"

This commit is contained in:
Jenkins 2016-12-15 20:27:22 +00:00 committed by Gerrit Code Review
commit ae1ddd23db

View File

@ -135,7 +135,7 @@
# Log output to standard error. This option is ignored if # Log output to standard error. This option is ignored if
# log_config_append is set. (boolean value) # log_config_append is set. (boolean value)
#use_stderr = true #use_stderr = false
# Format string to use for log messages with context. (string value) # 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 #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
@ -171,6 +171,19 @@
# (string value) # (string value)
#instance_uuid_format = "[instance: %(uuid)s] " #instance_uuid_format = "[instance: %(uuid)s] "
# Interval, number of seconds, of log rate limiting. (integer value)
#rate_limit_interval = 0
# Maximum number of logged messages per rate_limit_interval. (integer
# value)
#rate_limit_burst = 0
# Log level name used by rate limiting: CRITICAL, ERROR, INFO,
# WARNING, DEBUG or empty string. Logs with level greater or equal to
# rate_limit_except_level are not filtered. An empty string means that
# all levels are filtered. (string value)
#rate_limit_except_level = CRITICAL
# Enables or disables fatal status of deprecations. (boolean value) # Enables or disables fatal status of deprecations. (boolean value)
#fatal_deprecations = false #fatal_deprecations = false
@ -626,7 +639,12 @@
# The region in which the identity server can be found. (string value) # The region in which the identity server can be found. (string value)
#region_name = <None> #region_name = <None>
# Directory used to cache files related to PKI tokens. (string value) # DEPRECATED: Directory used to cache files related to PKI tokens.
# This option has been deprecated in the Ocata release and will be
# removed in the P release. (string value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#signing_dir = <None> #signing_dir = <None>
# Optionally specify a list of memcached server(s) to use for caching. # Optionally specify a list of memcached server(s) to use for caching.
@ -641,11 +659,15 @@
# value) # value)
#token_cache_time = 300 #token_cache_time = 300
# Determines the frequency at which the list of revoked tokens is # DEPRECATED: Determines the frequency at which the list of revoked
# retrieved from the Identity service (in seconds). A high number of # tokens is retrieved from the Identity service (in seconds). A high
# revocation events combined with a low cache duration may # number of revocation events combined with a low cache duration may
# significantly reduce performance. Only valid for PKI tokens. # significantly reduce performance. Only valid for PKI tokens. This
# (integer value) # option has been deprecated in the Ocata release and will be removed
# in the P release. (integer value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#revocation_cache_time = 10 #revocation_cache_time = 10
# (Optional) If defined, indicate whether token data should be # (Optional) If defined, indicate whether token data should be
@ -700,20 +722,26 @@
# binding method that must be present in tokens. (string value) # binding method that must be present in tokens. (string value)
#enforce_token_bind = permissive #enforce_token_bind = permissive
# If true, the revocation list will be checked for cached tokens. This # DEPRECATED: If true, the revocation list will be checked for cached
# requires that PKI tokens are configured on the identity server. # tokens. This requires that PKI tokens are configured on the identity
# (boolean value) # server. (boolean value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#check_revocations_for_cached = false #check_revocations_for_cached = false
# Hash algorithms to use for hashing PKI tokens. This may be a single # DEPRECATED: Hash algorithms to use for hashing PKI tokens. This may
# algorithm or multiple. The algorithms are those supported by Python # be a single algorithm or multiple. The algorithms are those
# standard hashlib.new(). The hashes will be tried in the order given, # supported by Python standard hashlib.new(). The hashes will be tried
# so put the preferred one first for performance. The result of the # in the order given, so put the preferred one first for performance.
# first hash will be stored in the cache. This will typically be set # The result of the first hash will be stored in the cache. This will
# to multiple values only while migrating from a less secure algorithm # typically be set to multiple values only while migrating from a less
# to a more secure one. Once all the old tokens are expired this # secure algorithm to a more secure one. Once all the old tokens are
# option should be set to a single value for better performance. (list # expired this option should be set to a single value for better
# value) # performance. (list value)
# This option is deprecated for removal since Ocata.
# Its value may be silently ignored in the future.
# Reason: PKI token format is no longer supported.
#hash_algorithms = md5 #hash_algorithms = md5
# Authentication type to load (string value) # Authentication type to load (string value)