From 41ba79c531a383d5037c5373b4bf93203c888386 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Jul 2020 11:20:39 +0900 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: I5325bdfbcec13b53b83ac669fb2b91885c370e60 (cherry picked from commit e633bc0ae5a1d54907c12ae1a8b651c060a62562) (cherry picked from commit 033b93dc924f169e34a102f0e0d138fda0e89e16) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-fa5844b2d4fc0f86.yaml | 5 +++++ spec/classes/heat_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-fa5844b2d4fc0f86.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 9d9a86c5..9e6484ec 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -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 heat::keystone::authtoken( $password = $::os_service_default, $username = 'heat', @@ -212,6 +217,7 @@ class heat::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 ::heat::deps @@ -255,5 +261,6 @@ class heat::keystone::authtoken( token_cache_time => $token_cache_time, service_token_roles => $service_token_roles, service_token_roles_required => $service_token_roles_required, + interface => $interface, } } diff --git a/releasenotes/notes/keystone-authtoken-interface-fa5844b2d4fc0f86.yaml b/releasenotes/notes/keystone-authtoken-interface-fa5844b2d4fc0f86.yaml new file mode 100644 index 00000000..6feb9ba3 --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-fa5844b2d4fc0f86.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``heat::keystone::authtoken::interface`` parameter has been added, + which can be used to set the interface parameter in authtoken middleware. diff --git a/spec/classes/heat_keystone_authtoken_spec.rb b/spec/classes/heat_keystone_authtoken_spec.rb index ff222efa..db547da5 100644 --- a/spec/classes/heat_keystone_authtoken_spec.rb +++ b/spec/classes/heat_keystone_authtoken_spec.rb @@ -44,6 +44,7 @@ describe 'heat::keystone::authtoken' do is_expected.to contain_heat_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_heat_config('keystone_authtoken/service_token_roles').with_value('') is_expected.to contain_heat_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_heat_config('keystone_authtoken/interface').with_value('') end end @@ -84,6 +85,7 @@ describe 'heat::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :interface => 'internal', }) end @@ -121,6 +123,7 @@ describe 'heat::keystone::authtoken' do is_expected.to contain_heat_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_heat_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_heat_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_heat_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do