Merge "Remove revocation_cache_time parameter"

This commit is contained in:
Jenkins
2017-10-07 21:39:58 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 15 deletions

View File

@@ -178,15 +178,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*revocation_cache_time*]
# (Optional) Determines the frequency at which the list of revoked tokens is
# retrieved from the Identity service (in seconds). A high number of
# revocation events combined with a low cache duration may significantly
# reduce performance. Only valid for PKI tokens. Integer value
# Defaults to undef
#
class nova::metadata::novajoin::authtoken( class nova::metadata::novajoin::authtoken(
$username = 'novajoin', $username = 'novajoin',
$password = $::os_service_default, $password = $::os_service_default,
@@ -222,18 +213,12 @@ class nova::metadata::novajoin::authtoken(
$manage_memcache_package = false, $manage_memcache_package = false,
$region_name = $::os_service_default, $region_name = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$revocation_cache_time = undef,
) { ) {
if is_service_default($password) { if is_service_default($password) {
fail('Please set password for novajoin service user') fail('Please set password for novajoin service user')
} }
if $revocation_cache_time {
warning('revocation_cache_time parameter is deprecated, has no effect and will be removed in the future.')
}
keystone::resource::authtoken { 'novajoin_config': keystone::resource::authtoken { 'novajoin_config':
username => $username, username => $username,
password => $password, password => $password,

View File

@@ -0,0 +1,5 @@
---
upgrade:
- remove revocation_cache_time parameter
revocation_cache_time parameter is deprecated, has no effect
and will be removed in the future.