openstack
/
puppet-vitrage
Code Issues Proposed changes

Add support for the interface parameter in authtoken middleware 

This patch adds support for [keystone_authtoken] interface parameter,
so that operators can define which endpoint should be used by authtoken
middleware.

Change-Id: I91206baca49e0c0b052c2ccc014842b8a5015e49
(cherry picked from commit f349ceec5d)
(cherry picked from commit acfbdd6427)
This commit is contained in:
Lewis Denny 2020-07-16 19:18:53 +10:00 committed by Takashi Kajinami
parent 140346bf15
commit a1c5107343
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/authtoken.pp
View File

@ -166,6 +166,11 @@
# true/false
# Defaults to $::os_service_default.
#
# [*interface*]
# (Optional) Interface to use for the Identity API endpoint. Valid values are
# "public", "internal" or "admin".
# Defaults to $::os_service_default.
#
class vitrage::keystone::authtoken(
$password,
$username = 'vitrage',
@ -200,6 +205,7 @@ class vitrage::keystone::authtoken(
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$interface = $::os_service_default,
) {
include ::vitrage::deps
@ -238,6 +244,7 @@ class vitrage::keystone::authtoken(
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

5
releasenotes/notes/keystone-authtoken-interface-88956fcd6ff1ca54.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``vitrage::keystone::authtoken::interface`` parameter has been added,
which can be used to set the interface parameter in authtoken middleware.

3
spec/classes/vitrage_keystone_authtoken_spec.rb
View File

@ -48,6 +48,7 @@ describe 'vitrage::keystone::authtoken' do
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_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_vitrage_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -87,6 +88,7 @@ describe 'vitrage::keystone::authtoken' do
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -123,6 +125,7 @@ describe 'vitrage::keystone::authtoken' do
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_required').with_value(params[:service_token_roles_required])
is_expected.to contain_vitrage_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do