From 89a24c2001f45e3a270f3247040bc352ee148faa Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Jul 2020 10:57:17 +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: I179fa93a0226f982019f2366684aa24b4e6e9a12 (cherry picked from commit 6d825ca6fe925f535504f34626f82116cdc49dd4) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-e1fe904a198d11bb.yaml | 6 ++++++ spec/classes/neutron_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-e1fe904a198d11bb.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 3bdc3a9ad..2c8dcb1f0 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 neutron::keystone::authtoken( $username = 'neutron', $password = $::os_service_default, @@ -212,6 +217,7 @@ class neutron::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 neutron::deps @@ -255,5 +261,6 @@ class neutron::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-e1fe904a198d11bb.yaml b/releasenotes/notes/keystone-authtoken-interface-e1fe904a198d11bb.yaml new file mode 100644 index 000000000..d6998ab9e --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-e1fe904a198d11bb.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new ``neutron::keystone::authtoken::interface`` parameter has been + added, which can be used to set the interface parameter in authtoken + middleware. diff --git a/spec/classes/neutron_keystone_authtoken_spec.rb b/spec/classes/neutron_keystone_authtoken_spec.rb index 72d719dda..d43423c75 100644 --- a/spec/classes/neutron_keystone_authtoken_spec.rb +++ b/spec/classes/neutron_keystone_authtoken_spec.rb @@ -41,6 +41,7 @@ describe 'neutron::keystone::authtoken' do should contain_neutron_config('keystone_authtoken/token_cache_time').with_value('') should contain_neutron_config('keystone_authtoken/service_token_roles').with_value('') should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('') + should contain_neutron_config('keystone_authtoken/interface').with_value('') end end @@ -81,6 +82,7 @@ describe 'neutron::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :interface => 'internal', }) end @@ -118,6 +120,7 @@ describe 'neutron::keystone::authtoken' do should contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) should contain_neutron_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + should contain_neutron_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do