openstack/puppet-vitrage
Code Issues Proposed changes

Add service_token_roles for keystone authtoken config

Browse Source 
Add the ability to configure service_token_roles.

Change-Id: I004d2c8e9bc1ce82d21d71b8b8b5c95816a0104c
Closes-Bug: #1892284
This commit is contained in:
ZhongShengping 2020-08-20 10:41:27 +08:00
parent 49786bd1d6
commit 10ce01e3c9
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

@ -160,6 +160,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
@ -204,6 +214,7 @@ class vitrage::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,
$interface = $::os_service_default,
) {
@ -243,6 +254,7 @@ class vitrage::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,
interface => $interface,
}

4
releasenotes/notes/add-service_token_roles-option-a220612330063caa.yaml Normal file
View File

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

3
spec/classes/vitrage_keystone_authtoken_spec.rb
View File

@ -47,6 +47,7 @@ describe 'vitrage::keystone::authtoken' do
is_expected.to contain_vitrage_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
@ -87,6 +88,7 @@ describe 'vitrage::keystone::authtoken' do
:manage_memcache_package => true,
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => false,
:interface => 'internal',
})
@ -124,6 +126,7 @@ 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/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_vitrage_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_vitrage_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_vitrage_config('keystone_authtoken/interface').with_value(params[:interface])
end