openstack/puppet-aodh
Code Issues Proposed changes

Add support to configure service_token_roles in authtoken middleware

Browse Source 
Change-Id: I881058fdc53c3ff381b96438ef46dfdc852ece94
This commit is contained in:
Takashi Kajinami 2019-09-21 09:48:05 +09:00
parent 2b0cfc8fa4
commit f9491ff8df
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/authtoken.pp
View File

@ -161,6 +161,16 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default.
#
# [*service_token_roles*]
# (Optional) A choice of roles that must be present in a service token.
# Service tokens are allowed to request that an expired token
# can be used and so this check should tightly control that
# only actual services should be sending this token. Roles
# here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list 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
@ -200,6 +210,7 @@ class aodh::keystone::authtoken(
$manage_memcache_package = false,
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default,
) {
@ -242,6 +253,7 @@ class aodh::keystone::authtoken(
manage_memcache_package => $manage_memcache_package,
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
}
}

4
releasenotes/notes/service_token_roles-e4dd15a598da6c9b.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add support to configure service_token_roles in authtoken middleware.

3
spec/classes/aodh_keystone_authtoken_spec.rb
View File

@ -42,6 +42,7 @@ describe 'aodh::keystone::authtoken' do
is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
end
end
@ -83,6 +84,7 @@ describe 'aodh::keystone::authtoken' do
:manage_memcache_package => true,
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => false,
})
end
@ -119,6 +121,7 @@ describe 'aodh::keystone::authtoken' do
is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
end