From 896a3160a352677c87542ff8b6f66ae0b9a17d18 Mon Sep 17 00:00:00 2001 From: Lewis Denny Date: Thu, 16 Jul 2020 19:49:14 +1000 Subject: [PATCH] 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 bf7ecaffb6358a17d973665df2a73ccdeae57682) (cherry picked from commit 2411de0c214230168bf811fc8d1e1fdc74ec4bd1) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-7148ae51c1971a27.yaml | 5 +++++ spec/classes/watcher_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-7148ae51c1971a27.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index c80d8b9..d68adf6 100644 --- a/manifests/keystone/authtoken.pp +++ b/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, } } diff --git a/releasenotes/notes/keystone-authtoken-interface-7148ae51c1971a27.yaml b/releasenotes/notes/keystone-authtoken-interface-7148ae51c1971a27.yaml new file mode 100644 index 0000000..e28ec08 --- /dev/null +++ b/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. diff --git a/spec/classes/watcher_keystone_authtoken_spec.rb b/spec/classes/watcher_keystone_authtoken_spec.rb index ca67c91..b283fbf 100644 --- a/spec/classes/watcher_keystone_authtoken_spec.rb +++ b/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('') is_expected.to contain_watcher_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_watcher_config('keystone_authtoken/interface').with_value('') 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