diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 1af70568f..a6987927c 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -175,16 +175,18 @@ # 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 # (in seconds). Set to -1 to disable caching completely. Integer value # Defaults to $::os_service_default. # +# DEPRECATED PARAMETERS +# +# [*signing_dir*] +# (Optional) Directory used to cache files related to PKI tokens. +# Defaults to undef +# class neutron::keystone::authtoken( $username = 'neutron', $password = $::os_service_default, @@ -219,14 +221,19 @@ class neutron::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, + # DEPRECATED PARAMETERS + $signing_dir = undef, ) { if is_service_default($password) { fail('Please set password for neutron service user') } + if $signing_dir { + warning('signing_dir parameter is deprecated, has no effect and will be removed in the P release.') + } + keystone::resource::authtoken { 'neutron_config': username => $username, password => $password, @@ -261,7 +268,6 @@ class neutron::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/releasenotes/notes/deprecate_signing_dir_parameter-31935a334ef12d98.yaml b/releasenotes/notes/deprecate_signing_dir_parameter-31935a334ef12d98.yaml new file mode 100644 index 000000000..9c3ade956 --- /dev/null +++ b/releasenotes/notes/deprecate_signing_dir_parameter-31935a334ef12d98.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - signing_dir option is now deprecated for removal, the + parameter has no effect. diff --git a/spec/classes/neutron_keystone_authtoken_spec.rb b/spec/classes/neutron_keystone_authtoken_spec.rb index 5fc0ef372..025c4f0cd 100644 --- a/spec/classes/neutron_keystone_authtoken_spec.rb +++ b/spec/classes/neutron_keystone_authtoken_spec.rb @@ -44,7 +44,6 @@ describe 'neutron::keystone::authtoken' do is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_neutron_config('keystone_authtoken/revocation_cache_time').with_value('') - is_expected.to contain_neutron_config('keystone_authtoken/signing_dir').with_value('') is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value('') end end @@ -85,7 +84,6 @@ describe 'neutron::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 @@ -124,7 +122,6 @@ describe 'neutron::keystone::authtoken' do 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/revocation_cache_time').with_value(params[:revocation_cache_time]) - is_expected.to contain_neutron_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir]) is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) end end