openstack/puppet-cloudkitty
Code Issues Proposed changes

Deprecate revocation_cache_time option

Browse Source 
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: Icc0a6e0b3e0b5330873d22e4625f7e21211f0438
Closes-Bug: #1717144
This commit is contained in:
ZhongShengping
2017-09-14 11:05:28 +08:00
parent 34a0f16e65
commit 7ee19f7241
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/keystone/authtoken.pp
View File

@@ -171,13 +171,6 @@
# (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
@@ -218,7 +211,6 @@ class cloudkitty::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,
) { ) {
@@ -258,7 +250,6 @@ class cloudkitty::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,
} }
} }

3
spec/classes/cloudkitty_keystone_authtoken_spec.rb
View File

@@ -43,7 +43,6 @@ describe 'cloudkitty::keystone::authtoken' do
is_expected.to contain_cloudkitty_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
end end
end end
@@ -84,7 +83,6 @@ describe 'cloudkitty::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 'cloudkitty::keystone::authtoken' do
is_expected.to contain_cloudkitty_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) is_expected.to contain_cloudkitty_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_cloudkitty_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
end end