openstack
/
puppet-nova
Code Issues Proposed changes

Add support for the keystone_authtoken/service_type parameter 

Change-Id: I2ed8dfabd6e99c468456cca960996d9adc3b8f9c
This commit is contained in:
Takashi Kajinami 2020-10-11 21:27:59 +09:00
parent 1d848e5aa0
commit da99cfcbd5
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/authtoken.pp
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".
@ -221,6 +226,7 @@ class nova::keystone::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,
$params = {},
) {
@ -269,6 +275,7 @@ class nova::keystone::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;
}
}

5
releasenotes/notes/keystone-authtoken-service_type-6b60c7d5840cbefe.yaml Normal file
View File

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

9
spec/classes/nova_keystone_authtoken_spec.rb
View File

@ -44,6 +44,7 @@ describe 'nova::keystone::authtoken' do
is_expected.to contain_nova_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -85,8 +86,8 @@ describe 'nova::keystone::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => true,
:service_type => 'identity',
:interface => 'internal',
:params => { 'service_type' => "compute" },
})
end
@ -125,7 +126,7 @@ describe 'nova::keystone::authtoken' do
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value(params[:interface])
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value(params[:params]['service_type'])
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value(params[:service_type])
end
it 'installs python memcache package' do
@ -136,8 +137,8 @@ describe 'nova::keystone::authtoken' do
context 'when overriding parameters via params hash' do
before do
params.merge!({
:username => 'myuser',
:params => { 'username' => "myotheruser" },
:username => 'myuser',
:params => { 'username' => 'myotheruser' },
})
end