Remove signing_dir option
The signing_dir is deprecated for removel because PKI token format is no longer supported. Change-Id: I52d0aef39df4977eab62081b6604533db8cf1a6a Closes-Bug: #1652700
This commit is contained in:
parent
cf78fa6c08
commit
a84f000b53
|
@ -179,10 +179,6 @@
|
||||||
# reduce performance. Only valid for PKI tokens. Integer value
|
# reduce performance. Only valid for PKI tokens. Integer value
|
||||||
# Defaults to $::os_service_default.
|
# 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*]
|
# [*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
|
||||||
|
@ -223,7 +219,6 @@ class panko::keystone::authtoken(
|
||||||
$memcached_servers = $::os_service_default,
|
$memcached_servers = $::os_service_default,
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$revocation_cache_time = $::os_service_default,
|
$revocation_cache_time = $::os_service_default,
|
||||||
$signing_dir = $::os_service_default,
|
|
||||||
$token_cache_time = $::os_service_default,
|
$token_cache_time = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
@ -263,7 +258,6 @@ class panko::keystone::authtoken(
|
||||||
memcached_servers => $memcached_servers,
|
memcached_servers => $memcached_servers,
|
||||||
region_name => $region_name,
|
region_name => $region_name,
|
||||||
revocation_cache_time => $revocation_cache_time,
|
revocation_cache_time => $revocation_cache_time,
|
||||||
signing_dir => $signing_dir,
|
|
||||||
token_cache_time => $token_cache_time,
|
token_cache_time => $token_cache_time,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,6 @@ describe 'panko::keystone::authtoken' do
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_panko_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_panko_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_panko_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/signing_dir').with_value('<SERVICE DEFAULT>')
|
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_panko_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -85,7 +84,6 @@ describe 'panko::keystone::authtoken' do
|
||||||
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
||||||
:region_name => 'region2',
|
:region_name => 'region2',
|
||||||
:revocation_cache_time => '11',
|
:revocation_cache_time => '11',
|
||||||
:signing_dir => '/var/cache',
|
|
||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
@ -124,7 +122,6 @@ describe 'panko::keystone::authtoken' do
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
is_expected.to contain_panko_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
is_expected.to contain_panko_config('keystone_authtoken/region_name').with_value(params[:region_name])
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
is_expected.to contain_panko_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/signing_dir').with_value(params[:signing_dir])
|
|
||||||
is_expected.to contain_panko_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
is_expected.to contain_panko_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue