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: I02f2b0cfe4641616a59043c947c65d373597da55
(cherry picked from commit 3ac484f1d2)
(cherry picked from commit 53b48ba1f7)
This commit is contained in:
Takashi Kajinami 2020-07-09 08:34:26 +09:00
parent c830d4b600
commit ea090a675f
3 changed files with 16 additions and 0 deletions

View File

@ -177,6 +177,11 @@
# true/false # true/false
# Defaults to $::os_service_default. # 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 gnocchi::keystone::authtoken( class gnocchi::keystone::authtoken(
$username = 'gnocchi', $username = 'gnocchi',
$password = $::os_service_default, $password = $::os_service_default,
@ -212,6 +217,7 @@ class gnocchi::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,
$interface = $::os_service_default,
) { ) {
include ::gnocchi::deps include ::gnocchi::deps
@ -255,5 +261,6 @@ class gnocchi::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,
interface => $interface,
} }
} }

View File

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

View File

@ -44,6 +44,7 @@ describe 'gnocchi::keystone::authtoken' do
is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>') is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end end
end end
@ -84,6 +85,7 @@ describe 'gnocchi::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,
:interface => 'internal',
}) })
end end
@ -121,6 +123,7 @@ describe 'gnocchi::keystone::authtoken' do
is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_gnocchi_config('keystone_authtoken/interface').with_value(params[:interface])
end end
it 'installs python memcache package' do it 'installs python memcache package' do