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: I39bf94a041d7d4af31fb2653c9274ee8fbdb732e
This commit is contained in:
parent
5329372ad3
commit
33d690c7eb
|
@ -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 aodh::keystone::authtoken(
|
class aodh::keystone::authtoken(
|
||||||
$username = 'aodh',
|
$username = 'aodh',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
|
@ -212,6 +217,7 @@ class aodh::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 aodh::deps
|
include aodh::deps
|
||||||
|
@ -255,5 +261,6 @@ class aodh::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,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``aodh::keystone::authtoken::interface`` parameter has been added,
|
||||||
|
which can be used to set the interface parameter in authtoken middleware.
|
|
@ -44,6 +44,7 @@ describe 'aodh::keystone::authtoken' do
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_aodh_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -62,8 +63,7 @@ describe 'aodh::keystone::authtoken' do
|
||||||
:auth_type => 'password',
|
:auth_type => 'password',
|
||||||
:auth_version => 'v3',
|
:auth_version => 'v3',
|
||||||
:cache => 'somevalue',
|
:cache => 'somevalue',
|
||||||
:cafile =>
|
:cafile => '/opt/stack/data/cafile.pem',
|
||||||
'/opt/stack/data/cafile.pem',
|
|
||||||
:certfile => 'certfile.crt',
|
:certfile => 'certfile.crt',
|
||||||
:delay_auth_decision => false,
|
:delay_auth_decision => false,
|
||||||
:enforce_token_bind => 'permissive',
|
:enforce_token_bind => 'permissive',
|
||||||
|
@ -79,13 +79,13 @@ describe 'aodh::keystone::authtoken' do
|
||||||
:memcache_secret_key => 'secret_key',
|
:memcache_secret_key => 'secret_key',
|
||||||
:memcache_security_strategy => 'ENCRYPT',
|
:memcache_security_strategy => 'ENCRYPT',
|
||||||
:memcache_use_advanced_pool => true,
|
:memcache_use_advanced_pool => true,
|
||||||
:memcached_servers =>
|
:memcached_servers => ['memcached01:11211','memcached02:11211'],
|
||||||
['memcached01:11211','memcached02:11211'],
|
|
||||||
:manage_memcache_package => true,
|
:manage_memcache_package => true,
|
||||||
:region_name => 'region2',
|
:region_name => 'region2',
|
||||||
: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
|
||||||
|
|
||||||
|
@ -123,6 +123,7 @@ describe 'aodh::keystone::authtoken' do
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
||||||
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
||||||
|
is_expected.to contain_aodh_config('keystone_authtoken/interface').with_value(params[:interface])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'installs python memcache package' do
|
it 'installs python memcache package' do
|
||||||
|
|
Loading…
Reference in New Issue