From 11552e857aa6249979a2cdd1db167e94733e26a2 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 15 Aug 2019 11:51:37 +0800
Subject: [PATCH] Remove deprecated pki related options
The deprecated pki related options check_revocations_for_cached and
hash_algorithms option has been removed.
Change-Id: Ibf3bd406b7d6c62290d6e5ba61914e76f96c5a09
---
manifests/keystone/authtoken.pp | 30 -------------------
..._pki_related_options-947194335b995019.yaml | 5 ++++
2 files changed, 5 insertions(+), 30 deletions(-)
create mode 100644 releasenotes/notes/remove_deprecated_pki_related_options-947194335b995019.yaml
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 36f70021..86d08862 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -167,25 +167,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 barbican::keystone::authtoken(
$password = $::os_service_default,
$username = 'barbican',
@@ -220,9 +201,6 @@ class barbican::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 ::barbican::deps
@@ -231,14 +209,6 @@ class barbican::keystone::authtoken(
fail('Please set password for barbican service user')
}
- 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 { 'barbican_config':
username => $username,
password => $password,
diff --git a/releasenotes/notes/remove_deprecated_pki_related_options-947194335b995019.yaml b/releasenotes/notes/remove_deprecated_pki_related_options-947194335b995019.yaml
new file mode 100644
index 00000000..62af34f1
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_pki_related_options-947194335b995019.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The deprecated pki related options check_revocations_for_cached and
+ hash_algorithms option has been removed.