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: I74d848da4f2e923f224786fd55b35cb063bb59a1
This commit is contained in:
parent
5475190090
commit
a6eae2f39e
@ -177,6 +177,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 zaqar::keystone::authtoken(
|
||||
$username = 'zaqar',
|
||||
$password = $::os_service_default,
|
||||
@ -212,6 +217,7 @@ class zaqar::keystone::authtoken(
|
||||
$token_cache_time = $::os_service_default,
|
||||
$service_token_roles = $::os_service_default,
|
||||
$service_token_roles_required = $::os_service_default,
|
||||
$interface = $::os_service_default,
|
||||
) {
|
||||
|
||||
include zaqar::deps
|
||||
@ -255,5 +261,6 @@ class zaqar::keystone::authtoken(
|
||||
token_cache_time => $token_cache_time,
|
||||
service_token_roles => $service_token_roles,
|
||||
service_token_roles_required => $service_token_roles_required,
|
||||
interface => $interface,
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``zaqar::keystone::authtoken::interface`` parameter has been added,
|
||||
which can be used to set the interface parameter in authtoken middleware.
|
@ -44,6 +44,7 @@ describe 'zaqar::keystone::authtoken' do
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
@ -84,6 +85,7 @@ describe 'zaqar::keystone::authtoken' do
|
||||
:token_cache_time => '301',
|
||||
:service_token_roles => ['service'],
|
||||
:service_token_roles_required => false,
|
||||
:interface => 'internal',
|
||||
})
|
||||
end
|
||||
|
||||
@ -121,6 +123,7 @@ describe 'zaqar::keystone::authtoken' do
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
||||
is_expected.to contain_zaqar_config('keystone_authtoken/interface').with_value(params[:interface])
|
||||
end
|
||||
|
||||
it 'installs python memcache package' do
|
||||
|
Loading…
Reference in New Issue
Block a user