x
/
tuskar
Code Issues Proposed changes

Regenerate tuskar.conf.sample 

Needed for the tests to start passing again.

Change-Id: Ie260efd5df189d0c69d847d0b0e48b365cd71340
This commit is contained in:
Jiri Stransky 2014-05-30 15:23:48 +02:00
parent ca24351c63
commit 20dfe9420f
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etc/tuskar/tuskar.conf.sample
View File

@ -547,7 +547,7 @@
#auth_uri=<None> #auth_uri=<None>
# Complete admin Identity API endpoint. This should specify # Complete admin Identity API endpoint. This should specify
# the unversioned root endpoint eg. https://localhost:35357/ # the unversioned root endpoint e.g. https://localhost:35357/
# (string value) # (string value)
#identity_uri=<None> #identity_uri=<None>
@ -568,9 +568,12 @@
# with Identity API Server. (integer value) # with Identity API Server. (integer value)
#http_request_max_retries=3 #http_request_max_retries=3
# Single shared secret with the Keystone configuration used # This option is deprecated and may be removed in a future
# for bootstrapping a Keystone installation, or otherwise # release. Single shared secret with the Keystone
# bypassing the normal authentication process. (string value) # configuration used for bootstrapping a Keystone
# installation, or otherwise bypassing the normal
# authentication process. This option should not be used, use
# `admin_user` and `admin_password` instead. (string value)
#admin_token=<None> #admin_token=<None>
# Keystone account username (string value) # Keystone account username (string value)
@ -622,7 +625,7 @@
# number of revocation events combined with a low cache # number of revocation events combined with a low cache
# duration may significantly reduce performance. (integer # duration may significantly reduce performance. (integer
# value) # value)
#revocation_cache_time=300 #revocation_cache_time=10
# (optional) if defined, indicate whether token data should be # (optional) if defined, indicate whether token data should be
# authenticated or authenticated and encrypted. Acceptable # authenticated or authenticated and encrypted. Acceptable
@ -655,6 +658,23 @@
# value) # value)
#enforce_token_bind=permissive #enforce_token_bind=permissive
# If true, the revocation list will be checked for cached
# tokens. This requires that PKI tokens are configured on the
# Keystone server. (boolean value)
#check_revocations_for_cached=false
# Hash algorithms to use for hashing PKI tokens. This may be a
# single algorithm or multiple. The algorithms are those
# supported by Python standard hashlib.new(). The hashes will
# be tried in the order given, so put the preferred one first
# for performance. The result of the first hash will be stored
# in the cache. This will typically be set to multiple values
# only while migrating from a less secure algorithm to a more
# secure one. Once all the old tokens are expired this option
# should be set to a single value for better performance.
# (list value)
#hash_algorithms=md5
[matchmaker_redis] [matchmaker_redis]