Remove deprecated pki related options
The deprecated pki related options check_revocations_for_cached and hash_algorithms option has been removed. Change-Id: I316beed11236a11d4789974da3656196e2795694
This commit is contained in:
parent
8bfb575bd1
commit
4656591f71
@ -167,25 +167,6 @@
|
|||||||
# true/false
|
# true/false
|
||||||
# Defaults to $::os_service_default.
|
# 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 heat::keystone::authtoken(
|
class heat::keystone::authtoken(
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$username = 'heat',
|
$username = 'heat',
|
||||||
@ -220,9 +201,6 @@ class heat::keystone::authtoken(
|
|||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$token_cache_time = $::os_service_default,
|
$token_cache_time = $::os_service_default,
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$check_revocations_for_cached = undef,
|
|
||||||
$hash_algorithms = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::heat::deps
|
include ::heat::deps
|
||||||
@ -231,14 +209,6 @@ class heat::keystone::authtoken(
|
|||||||
fail('Please set password for heat service user')
|
fail('Please set password for heat 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 { 'heat_config':
|
keystone::resource::authtoken { 'heat_config':
|
||||||
username => $username,
|
username => $username,
|
||||||
password => $password,
|
password => $password,
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated pki related options check_revocations_for_cached and
|
||||||
|
hash_algorithms option has been removed.
|
Loading…
Reference in New Issue
Block a user