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: Ic65f385e5f867cb7346b8b5fc62e8cbf7be8cfb3
(cherry picked from commit 17b97ec245)
(cherry picked from commit 1c680ae8f1)
This commit is contained in:
Takashi Kajinami 2020-07-08 10:52:42 +09:00
parent 4a97494230
commit 15557bbf22
3 changed files with 16 additions and 0 deletions

View File

@ -181,6 +181,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 cinder::keystone::authtoken( class cinder::keystone::authtoken(
$username = 'cinder', $username = 'cinder',
$password = $::os_service_default, $password = $::os_service_default,
@ -216,6 +221,7 @@ class cinder::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 ::cinder::deps include ::cinder::deps
@ -259,5 +265,6 @@ class cinder::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 ``cinder::keystone::authtoken::interface`` parameter has been
added, which can be used to set the interface parameter in authtoken
middleware.

View File

@ -43,6 +43,7 @@ describe 'cinder::keystone::authtoken' do
is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>') is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end end
end end
@ -83,6 +84,7 @@ describe 'cinder::keystone::authtoken' do
:token_cache_time => '301', :token_cache_time => '301',
:service_token_roles => ['admin'], :service_token_roles => ['admin'],
:service_token_roles_required => true, :service_token_roles_required => true,
:interface => 'internal',
}) })
end end
@ -120,6 +122,7 @@ describe 'cinder::keystone::authtoken' do
is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_cinder_config('keystone_authtoken/interface').with_value(params[:interface])
end end
it 'installs python memcache package' do it 'installs python memcache package' do