Browse Source

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: I39e914c199d9bbd9003a2ad12b6d26b59c7b15a5
(cherry picked from commit bf7ecaffb6)
(cherry picked from commit 2411de0c21)
changes/79/820879/1
Lewis Denny 2 years ago committed by Takashi Kajinami
parent
commit
896a3160a3
  1. 7
      manifests/keystone/authtoken.pp
  2. 5
      releasenotes/notes/keystone-authtoken-interface-7148ae51c1971a27.yaml
  3. 3
      spec/classes/watcher_keystone_authtoken_spec.rb

7
manifests/keystone/authtoken.pp

@ -169,6 +169,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 watcher::keystone::authtoken (
$password = $::os_service_default,
$username = 'watcher',
@ -203,6 +208,7 @@ class watcher::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 ::watcher::deps
@ -247,6 +253,7 @@ class watcher::keystone::authtoken (
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

5
releasenotes/notes/keystone-authtoken-interface-7148ae51c1971a27.yaml

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

3
spec/classes/watcher_keystone_authtoken_spec.rb

@ -47,6 +47,7 @@ describe 'watcher::keystone::authtoken' do
is_expected.to contain_watcher_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_watcher_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -86,6 +87,7 @@ describe 'watcher::keystone::authtoken' do
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -122,6 +124,7 @@ describe 'watcher::keystone::authtoken' do
is_expected.to contain_watcher_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_watcher_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_watcher_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_watcher_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do

Loading…
Cancel
Save