Merge "Add support for the keystone_authtoken/service_type parameter"

This commit is contained in:
Zuul 2020-10-13 17:00:53 +00:00 committed by Gerrit Code Review
commit bd664dace3
3 changed files with 15 additions and 0 deletions

View File

@ -177,6 +177,11 @@
# true/false # true/false
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*service_type*]
# (Optional) The name or type of the service as it appears in the service
# catalog. This is used to validate tokens that have restricted access rules.
# Defaults to $::os_service_default.
#
# [*interface*] # [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are # (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin". # "public", "internal" or "admin".
@ -217,6 +222,7 @@ class barbican::keystone::authtoken(
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
$service_token_roles = $::os_service_default, $service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default, $interface = $::os_service_default,
) { ) {
@ -261,6 +267,7 @@ class barbican::keystone::authtoken(
token_cache_time => $token_cache_time, token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles, service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required, service_token_roles_required => $service_token_roles_required,
service_type => $service_type,
interface => $interface, interface => $interface,
} }
} }

View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``barbican::keystone::authtoken::service_type`` parameter has been
added to configure the service_type parameter in authtoken middleware.

View File

@ -63,6 +63,7 @@ describe 'barbican::keystone::authtoken' do
is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>') is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_barbican_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>') is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end end
end end
@ -104,6 +105,7 @@ describe 'barbican::keystone::authtoken' do
:token_cache_time => '301', :token_cache_time => '301',
:service_token_roles => ['service'], :service_token_roles => ['service'],
:service_token_roles_required => false, :service_token_roles_required => false,
:service_type => 'dentity',
:interface => 'internal', :interface => 'internal',
}) })
end end
@ -142,6 +144,7 @@ describe 'barbican::keystone::authtoken' do
is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_barbican_config('keystone_authtoken/service_type').with_value(params[:service_type])
is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value(params[:interface]) is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value(params[:interface])
end end