diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 0d7cbdb..1d54173 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -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, } } diff --git a/spec/classes/ec2api_keystone_authtoken_spec.rb b/spec/classes/ec2api_keystone_authtoken_spec.rb index 6e363ae..a2ad33b 100644 --- a/spec/classes/ec2api_keystone_authtoken_spec.rb +++ b/spec/classes/ec2api_keystone_authtoken_spec.rb @@ -48,7 +48,6 @@ describe 'ec2api::keystone::authtoken' do is_expected.to contain_ec2api_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/revocation_cache_time').with_value('') - is_expected.to contain_ec2api_config('keystone_authtoken/signing_dir').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value('') 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