From 2941b3f939e1654de5eb4d63514adf84de786ef3 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 28 Dec 2016 14:38:22 +0800 Subject: [PATCH] Remove signing_dir option The signing_dir is deprecated for removel because PKI token format is no longer supported. Change-Id: I8eca92237301a26a014b95b138211cb655d88f7e Closes-Bug: #1652700 --- manifests/keystone/authtoken.pp | 6 ------ spec/classes/vitrage_keystone_authtoken_spec.rb | 3 --- 2 files changed, 9 deletions(-) diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 7f29cce..d712b01 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 vitrage::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 vitrage::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/vitrage_keystone_authtoken_spec.rb b/spec/classes/vitrage_keystone_authtoken_spec.rb index 792a719..c756c3b 100644 --- a/spec/classes/vitrage_keystone_authtoken_spec.rb +++ b/spec/classes/vitrage_keystone_authtoken_spec.rb @@ -49,7 +49,6 @@ describe 'vitrage::keystone::authtoken' do is_expected.to contain_vitrage_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_vitrage_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_vitrage_config('keystone_authtoken/revocation_cache_time').with_value('') - is_expected.to contain_vitrage_config('keystone_authtoken/signing_dir').with_value('') is_expected.to contain_vitrage_config('keystone_authtoken/token_cache_time').with_value('') end end @@ -90,7 +89,6 @@ describe 'vitrage::keystone::authtoken' do :memcached_servers => ['memcached01:11211','memcached02:11211'], :region_name => 'region2', :revocation_cache_time => '11', - :signing_dir => '/var/cache', :token_cache_time => '301', }) end @@ -129,7 +127,6 @@ describe 'vitrage::keystone::authtoken' do is_expected.to contain_vitrage_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_vitrage_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_vitrage_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time]) - is_expected.to contain_vitrage_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir]) is_expected.to contain_vitrage_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) end end