openstack
/
puppet-glance
Code Issues Proposed changes

Remove deprecated pki related options 

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

Change-Id: Ib692f55fa267e9fbe17d94c5116f244be02b2107
This commit is contained in:
ZhongShengping 2019-08-15 11:51:36 +08:00
parent 17fee69289
commit e82d93c1c0
3 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/api/authtoken.pp
View File

@ -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 glance::api::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -220,9 +201,6 @@ class glance::api::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 ::glance::deps
@ -231,14 +209,6 @@ class glance::api::authtoken(
fail('Please set password for Glance 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 { 'glance_api_config':
username => $username,
password => $password,

30
manifests/registry/authtoken.pp
View File

@ -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 glance::registry::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -220,9 +201,6 @@ class glance::registry::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 ::glance::deps
@ -231,14 +209,6 @@ class glance::registry::authtoken(
fail('Please set password for Glance 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 { 'glance_registry_config':
username => $username,
password => $password,

5
releasenotes/notes/remove_deprecated_pki_related_options-bc4c9c7169048ddf.yaml Normal file
View File

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