openstack/keystonemiddleware
Code Issues Proposed changes

Merge "Deprecate PKI token format options"

Browse Source
This commit is contained in:
Jenkins 2016-11-09 13:14:44 +00:00 committed by Gerrit Code Review
commit b2951608a5
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
keystonemiddleware/auth_token/_opts.py
View File

@ -78,7 +78,12 @@ _OPTS = [
cfg.StrOpt('region_name', cfg.StrOpt('region_name',
help='The region in which the identity server can be found.'), help='The region in which the identity server can be found.'),
cfg.StrOpt('signing_dir', cfg.StrOpt('signing_dir',
help='Directory used to cache files related to PKI tokens.'), deprecated_for_removal=True,
deprecated_reason='PKI token format is no longer supported.',
deprecated_since='Ocata',
help='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.'),
cfg.ListOpt('memcached_servers', cfg.ListOpt('memcached_servers',
deprecated_name='memcache_servers', deprecated_name='memcache_servers',
help='Optionally specify a list of memcached server(s) to' help='Optionally specify a list of memcached server(s) to'
@ -92,11 +97,15 @@ _OPTS = [
' caching completely.'), ' caching completely.'),
cfg.IntOpt('revocation_cache_time', cfg.IntOpt('revocation_cache_time',
default=10, default=10,
deprecated_for_removal=True,
deprecated_reason='PKI token format is no longer supported.',
deprecated_since='Ocata',
help='Determines the frequency at which the list of revoked' help='Determines the frequency at which the list of revoked'
' tokens is retrieved from the Identity service (in seconds). A' ' tokens is retrieved from the Identity service (in seconds). A'
' high number of revocation events combined with a low cache' ' high number of revocation events combined with a low cache'
' duration may significantly reduce performance. Only valid' ' duration may significantly reduce performance. Only valid'
' for PKI tokens.'), ' for PKI tokens. This option has been deprecated in the Ocata'
' release and will be removed in the P release.'),
cfg.StrOpt('memcache_security_strategy', cfg.StrOpt('memcache_security_strategy',
default='None', default='None',
choices=('None', 'MAC', 'ENCRYPT'), choices=('None', 'MAC', 'ENCRYPT'),
@ -153,10 +162,16 @@ _OPTS = [
' token binding is needed to be allowed. Finally the name of a' ' token binding is needed to be allowed. Finally the name of a'
' binding method that must be present in tokens.'), ' binding method that must be present in tokens.'),
cfg.BoolOpt('check_revocations_for_cached', default=False, cfg.BoolOpt('check_revocations_for_cached', default=False,
deprecated_for_removal=True,
deprecated_reason='PKI token format is no longer supported.',
deprecated_since='Ocata',
help='If true, the revocation list will be checked for cached' help='If true, the revocation list will be checked for cached'
' tokens. This requires that PKI tokens are configured on the' ' tokens. This requires that PKI tokens are configured on the'
' identity server.'), ' identity server.'),
cfg.ListOpt('hash_algorithms', default=['md5'], cfg.ListOpt('hash_algorithms', default=['md5'],
deprecated_for_removal=True,
deprecated_reason='PKI token format is no longer supported.',
deprecated_since='Ocata',
help='Hash algorithms to use for hashing PKI tokens. This may' help='Hash algorithms to use for hashing PKI tokens. This may'
' be a single algorithm or multiple. The algorithms are those' ' be a single algorithm or multiple. The algorithms are those'
' supported by Python standard hashlib.new(). The hashes will' ' supported by Python standard hashlib.new(). The hashes will'