openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Remove deprecated keystone authtoken revocation_cache_time option"

This commit is contained in:
Zuul 2018-03-28 18:26:07 +00:00 committed by Gerrit Code Review
parent 95b91f45c1 f7771d8ff6
commit 80c58df276
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/api/authtoken.pp
View File

@ -178,15 +178,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# 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 glance::api::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -222,8 +213,6 @@ class glance::api::authtoken(
$manage_memcache_package = false,
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$revocation_cache_time = undef,
) {
include ::glance::deps
@ -232,10 +221,6 @@ class glance::api::authtoken(
fail('Please set password for Glance 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 { 'glance_api_config':
username => $username,
password => $password,

15
manifests/registry/authtoken.pp
View File

@ -178,15 +178,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# 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 glance::registry::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -222,8 +213,6 @@ class glance::registry::authtoken(
$manage_memcache_package = false,
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$revocation_cache_time = undef,
) {
include ::glance::deps
@ -232,10 +221,6 @@ class glance::registry::authtoken(
fail('Please set password for Glance 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 { 'glance_registry_config':
username => $username,
password => $password,

3
releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-89af492d7e32913e.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Deprecated keystone::authtoken::revocation_cache_time option has been removed.