Merge "Add support for the keystone_authtoken/service_type parameter"

This commit is contained in:
Zuul 2020-10-19 10:33:53 +00:00 committed by Gerrit Code Review
commit 07d61e47b5
5 changed files with 31 additions and 0 deletions

View File

@ -178,6 +178,11 @@
# a future release and should be enabled if possible.
# 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*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin".
@ -218,6 +223,7 @@ class ironic::api::authtoken(
$token_cache_time = $::os_service_default,
$service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
) {
@ -262,6 +268,7 @@ class ironic::api::authtoken(
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
service_type => $service_type,
interface => $interface,
}
}

View File

@ -177,6 +177,11 @@
# true/false
# 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*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin".
@ -217,6 +222,7 @@ class ironic::inspector::authtoken(
$token_cache_time = $::os_service_default,
$service_token_roles = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
) {
@ -261,6 +267,7 @@ class ironic::inspector::authtoken(
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
service_type => $service_type,
interface => $interface,
}
}

View File

@ -0,0 +1,8 @@
---
features:
- |
The following two parameters have been added to configure the service_type
parameter in authtoken middlewae.
- ``ironic::api::authtoken::service_type``
- ``ironic::inspector::authtoken::service_type``

View File

@ -44,6 +44,7 @@ describe 'ironic::api::authtoken' do
is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -85,6 +86,7 @@ describe 'ironic::api::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => true,
:service_type => 'identity',
:interface => 'internal',
})
end
@ -123,6 +125,7 @@ describe 'ironic::api::authtoken' do
is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_ironic_config('keystone_authtoken/service_type').with_value(params[:service_type])
is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value(params[:interface])
end

View File

@ -44,6 +44,8 @@ describe 'ironic::inspector::authtoken' do
is_expected.to contain_ironic_inspector_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -84,6 +86,8 @@ describe 'ironic::inspector::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => false,
:service_type => 'identity',
:interface => 'internal',
})
end
@ -121,6 +125,8 @@ describe 'ironic::inspector::authtoken' do
is_expected.to contain_ironic_inspector_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/service_type').with_value(params[:service_type])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do