Remove deprecated pki related options

The deprecated pki related options check_revocations_for_cached and
hash_algorithms option has been removed.

Change-Id: Ia1759d8535ae1d23623952752269bc4f017a77c4
This commit is contained in:
ZhongShengping 2019-08-15 11:51:37 +08:00
parent 6d3596860c
commit 55d8475d34
2 changed files with 5 additions and 30 deletions

View File

@ -169,25 +169,6 @@
# true/false
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*check_revocations_for_cached*]
# (Optional) If true, the revocation list will be checked for cached tokens.
# This requires that PKI tokens are configured on the identity server.
# boolean value.
# Defaults to undef.
#
# [*hash_algorithms*]
# (Optional) 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.
# Defaults to undef.
#
class watcher::keystone::authtoken (
$password = $::os_service_default,
$username = 'watcher',
@ -222,9 +203,6 @@ class watcher::keystone::authtoken (
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles_required = $::os_service_default,
# DEPRECATED PARAMETERS
$check_revocations_for_cached = undef,
$hash_algorithms = undef,
) {
include ::watcher::deps
@ -235,14 +213,6 @@ class watcher::keystone::authtoken (
validate_legacy(String, 'validate_string', $password)
if $check_revocations_for_cached {
warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.')
}
if $hash_algorithms {
warning('hash_algorithms parameter is deprecated, has no effect and will be removed in the future.')
}
keystone::resource::authtoken { 'watcher_config':
password => $password,
username => $username,

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated pki related options check_revocations_for_cached and
hash_algorithms option has been removed.