From d099f4356f21ae5a99c7302dc9096325c295a689 Mon Sep 17 00:00:00 2001 From: Lewis Denny Date: Thu, 16 Jul 2020 10:35:58 +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: I7cdb181057ad8a126fbbdd5d0862827a2ed28062 (cherry picked from commit 8610a7e5c4a906c91cf595174200ddff6e1ab1ba) (cherry picked from commit 9b71ece7507809ed111c43a9a9f9be6fc1f6a3e1) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-ea4c6ce7e8bf7842.yaml | 5 +++++ spec/classes/ec2api_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-ea4c6ce7e8bf7842.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 6cc92ad..a9b0045 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -166,6 +166,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 ec2api::keystone::authtoken( $password, $username = 'ec2api', @@ -200,6 +205,7 @@ class ec2api::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 ::ec2api::deps @@ -238,5 +244,6 @@ class ec2api::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-ea4c6ce7e8bf7842.yaml b/releasenotes/notes/keystone-authtoken-interface-ea4c6ce7e8bf7842.yaml new file mode 100644 index 0000000..64f4db5 --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-ea4c6ce7e8bf7842.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``ec2api::keystone::authtoken::interface`` parameter has been added, + which can be used to set the interface parameter in authtoken middleware. diff --git a/spec/classes/ec2api_keystone_authtoken_spec.rb b/spec/classes/ec2api_keystone_authtoken_spec.rb index 9192300..d46017c 100644 --- a/spec/classes/ec2api_keystone_authtoken_spec.rb +++ b/spec/classes/ec2api_keystone_authtoken_spec.rb @@ -47,6 +47,7 @@ describe 'ec2api::keystone::authtoken' do is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_ec2api_config('keystone_authtoken/interface').with_value('') end end @@ -88,6 +89,7 @@ describe 'ec2api::keystone::authtoken' do :region_name => 'region2', :token_cache_time => '301', :service_token_roles_required => false, + :interface => 'internal', }) end @@ -124,6 +126,7 @@ describe 'ec2api::keystone::authtoken' do is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_ec2api_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_ec2api_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do