Deprecate revocation_cache_time option
The revocation_cache_time is deprecated for removel because of PKI token format is no longer supported. Update warning message and add a release note. Change-Id: I743868dcdee5dd34988059a06c839e3e9e38af4a Closes-Bug: #1717144
This commit is contained in:
parent
6d01a5c05c
commit
c36ab754c3
@ -172,19 +172,21 @@
|
|||||||
# (Optional) The region in which the identity server can be found.
|
# (Optional) The region in which the identity server can be found.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
# [*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 $::os_service_default.
|
|
||||||
#
|
|
||||||
# [*token_cache_time*]
|
# [*token_cache_time*]
|
||||||
# (Optional) In order to prevent excessive effort spent validating tokens,
|
# (Optional) In order to prevent excessive effort spent validating tokens,
|
||||||
# the middleware caches previously-seen tokens for a configurable duration
|
# the middleware caches previously-seen tokens for a configurable duration
|
||||||
# (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 neutron::keystone::authtoken(
|
class neutron::keystone::authtoken(
|
||||||
$username = 'neutron',
|
$username = 'neutron',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
@ -219,14 +221,19 @@ class neutron::keystone::authtoken(
|
|||||||
$memcached_servers = $::os_service_default,
|
$memcached_servers = $::os_service_default,
|
||||||
$manage_memcache_package = false,
|
$manage_memcache_package = false,
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$revocation_cache_time = $::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 neutron service user')
|
fail('Please set password for neutron 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 { 'neutron_config':
|
keystone::resource::authtoken { 'neutron_config':
|
||||||
username => $username,
|
username => $username,
|
||||||
password => $password,
|
password => $password,
|
||||||
@ -261,7 +268,6 @@ class neutron::keystone::authtoken(
|
|||||||
memcached_servers => $memcached_servers,
|
memcached_servers => $memcached_servers,
|
||||||
manage_memcache_package => $manage_memcache_package,
|
manage_memcache_package => $manage_memcache_package,
|
||||||
region_name => $region_name,
|
region_name => $region_name,
|
||||||
revocation_cache_time => $revocation_cache_time,
|
|
||||||
token_cache_time => $token_cache_time,
|
token_cache_time => $token_cache_time,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- revocation_cache_time option is now deprecated for removal, the
|
||||||
|
parameter has no effect.
|
@ -43,7 +43,6 @@ describe 'neutron::keystone::authtoken' do
|
|||||||
is_expected.to contain_neutron_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_neutron_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
|
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -84,7 +83,6 @@ describe 'neutron::keystone::authtoken' do
|
|||||||
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
||||||
:manage_memcache_package => true,
|
:manage_memcache_package => true,
|
||||||
:region_name => 'region2',
|
:region_name => 'region2',
|
||||||
:revocation_cache_time => '11',
|
|
||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
@ -122,7 +120,6 @@ describe 'neutron::keystone::authtoken' do
|
|||||||
is_expected.to contain_neutron_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
|
is_expected.to contain_neutron_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
|
||||||
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user