Service_token_roles_required missing in the server config file

Service_token_roles_required missing in the server config file which
allows backwards compatibility to ensure that the service tokens are
compared against a list of possible roles for validity.

Change-Id: I985f74ca445fab6be1a7d8bf3f33531f0330149a
Closes-Bug: 1778198
This commit is contained in:
ZhongShengping 2019-02-15 10:03:09 +08:00
parent 397d8afc78
commit 865209bd1b
3 changed files with 16 additions and 0 deletions

View File

@ -160,6 +160,12 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default.
#
# [*service_token_roles_required*]
# (optional) backwards compatibility to ensure that the service tokens are
# compared against a list of possible roles for validity
# true/false
# Defaults to $::os_service_default.
#
class senlin::keystone::authtoken(
$password,
$username = 'senlin',
@ -193,6 +199,7 @@ class senlin::keystone::authtoken(
$manage_memcache_package = false,
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles_required = $::os_service_default,
) {
include ::senlin::deps
@ -230,6 +237,7 @@ class senlin::keystone::authtoken(
manage_memcache_package => $manage_memcache_package,
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles_required => $service_token_roles_required,
}
}

View File

@ -0,0 +1,5 @@
---
features:
- Service_token_roles_required missing in the server config file which
allows backwards compatibility to ensure that the service tokens are
compared against a list of possible roles for validity.

View File

@ -42,6 +42,7 @@ describe 'senlin::keystone::authtoken' do
is_expected.to contain_senlin_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_senlin_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_senlin_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_senlin_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
end
end
@ -80,6 +81,7 @@ describe 'senlin::keystone::authtoken' do
:manage_memcache_package => true,
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
})
end
@ -115,6 +117,7 @@ describe 'senlin::keystone::authtoken' do
is_expected.to contain_senlin_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_senlin_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_senlin_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_senlin_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
end
it 'installs python memcache package' do