New placement::keystone::authtoken::interface parameter

Adds interface parameter to placement::keystone::authtoken to configure
the interface to use for the Identity API endpoint. Valid values are
"public", "internal" or "admin"(default).

Depends-On: I90584d3b5900d2dc74ae8ae1ff293822e5d6ecd9

Change-Id: Ie80fb4e7d0514b65ec6a798a10cd7079c3ffa813
This commit is contained in:
Martin Schuppert 2019-10-16 09:09:34 +02:00
parent 4e68e8fdba
commit 5e5d7deffa
3 changed files with 16 additions and 0 deletions

View File

@ -167,6 +167,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"(default).
# Defaults to $::os_service_default.
#
class placement::keystone::authtoken(
$username = 'placement',
$password = $::os_service_default,
@ -201,6 +206,7 @@ class placement::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 ::placement::deps
@ -243,5 +249,6 @@ class placement::keystone::authtoken(
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

View File

@ -0,0 +1,6 @@
---
features:
- |
Adds interface parameter to placement::keystone::authtoken to configure
the interface to use for the Identity API endpoint. Valid values are
"public", "internal" or "admin"(default).

View File

@ -40,6 +40,7 @@ describe 'placement::keystone::authtoken' do
is_expected.to contain_placement_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
}
end
@ -79,6 +80,7 @@ describe 'placement::keystone::authtoken' do
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -115,6 +117,7 @@ describe 'placement::keystone::authtoken' do
is_expected.to contain_placement_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_placement_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_placement_config('keystone_authtoken/interface').with_value(params[:interface])
}
it { is_expected.to contain_package('python-memcache') }