openstack
/
puppet-ec2api
Code Issues Proposed changes

Remove signing_dir option 

The signing_dir is deprecated for removel because PKI token format
is no longer supported.

Change-Id: I7707c9e44b3d6ab63e10385f6549c30e2880daf4
Closes-Bug: #1652700
This commit is contained in:
ZhongShengping 2016-12-28 08:55:08 +08:00
parent 3010ef1dd7
commit a6f198abd3
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/keystone/authtoken.pp
View File

@ -174,10 +174,6 @@
# reduce performance. Only valid for PKI tokens. Integer value
# Defaults to $::os_service_default.
#
# [*signing_dir*]
# (Optional) Directory used to cache files related to PKI tokens.
# Defaults to $::os_service_default.
#
# [*token_cache_time*]
# (Optional) In order to prevent excessive effort spent validating tokens,
# the middleware caches previously-seen tokens for a configurable duration
@ -218,7 +214,6 @@ class ec2api::keystone::authtoken(
$memcached_servers = $::os_service_default,
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$signing_dir = $::os_service_default,
$token_cache_time = $::os_service_default,
) {
@ -258,7 +253,6 @@ class ec2api::keystone::authtoken(
memcached_servers => $memcached_servers,
region_name => $region_name,
revocation_cache_time => $revocation_cache_time,
signing_dir => $signing_dir,
token_cache_time => $token_cache_time,
}
}

3
spec/classes/ec2api_keystone_authtoken_spec.rb
View File

@ -48,7 +48,6 @@ describe 'ec2api::keystone::authtoken' do
is_expected.to contain_ec2api_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ec2api_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ec2api_config('keystone_authtoken/signing_dir').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
end
end
@ -91,7 +90,6 @@ describe 'ec2api::keystone::authtoken' do
['memcached01:11211','memcached02:11211'],
:region_name => 'region2',
:revocation_cache_time => '11',
:signing_dir => '/var/cache',
:token_cache_time => '301',
})
end
@ -130,7 +128,6 @@ describe 'ec2api::keystone::authtoken' do
is_expected.to contain_ec2api_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_ec2api_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
is_expected.to contain_ec2api_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir])
is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
end
end