openstack/puppet-manila
Code Issues Proposed changes

Add support for the interface parameter in authtoken middleware

Browse Source 
This patch adds support for [keystone_authtoken] interface parameter,
so that operators can define which endpoint should be used by authtoken
middleware.

Change-Id: I71ef2b5831420a59a3ef0fb9dbad672c27734c1d
This commit is contained in:
Lewis Denny 2020-07-14 22:16:10 +10:00
parent d76a567405
commit b92f8a9238
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

@ -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 manila::keystone::authtoken(
$password = $::os_service_default,
$username = 'manila',
@ -212,6 +217,7 @@ class manila::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 manila::deps
@ -255,5 +261,6 @@ class manila::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-a8c03fe93a850caa.yaml Normal file
View File

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

3
spec/classes/manila_keystone_authtoken_spec.rb
View File

@ -49,6 +49,7 @@ describe 'manila::keystone::authtoken' do
is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_manila_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -89,6 +90,7 @@ describe 'manila::keystone::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -126,6 +128,7 @@ describe 'manila::keystone::authtoken' do
is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_manila_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_manila_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do