openstack
/
puppet-designate
Code Issues Proposed changes

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: I494c1e25c98a57b78c779bcd0bf30c92fe70ff0a
(cherry picked from commit 02f935237d)
This commit is contained in:
Lewis Denny 2020-07-15 16:18:41 +10:00 committed by Takashi Kajinami
parent 48e59e6e72
commit a0e4625686
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/authtoken.pp
View File

@ -182,6 +182,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 designate::keystone::authtoken(
$username = 'designate',
$password = $::os_service_default,
@ -217,6 +222,7 @@ class designate::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 designate::deps
@ -260,5 +266,6 @@ class designate::keystone::authtoken(
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

5
releasenotes/notes/keystone-authtoken-interface-3d1e14584c143ef2.yaml Normal file
View File

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

3
spec/classes/designate_keystone_authtoken_spec.rb
View File

@ -44,6 +44,7 @@ describe 'designate::keystone::authtoken' do
is_expected.to contain_designate_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -84,6 +85,7 @@ describe 'designate::keystone::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['admin', 'service'],
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -121,6 +123,7 @@ describe 'designate::keystone::authtoken' do
is_expected.to contain_designate_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_designate_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do