From 16f079d760a7c6d85265b9e928ec508b3c0ddd26 Mon Sep 17 00:00:00 2001 From: Lewis Denny Date: Tue, 14 Jul 2020 22:16:10 +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: I71ef2b5831420a59a3ef0fb9dbad672c27734c1d (cherry picked from commit b92f8a9238b981f18f88540adcd3957efd4bdc81) (cherry picked from commit 16253272242c403c73e69c41ece49fb4fbb98f3c) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-a8c03fe93a850caa.yaml | 5 +++++ spec/classes/manila_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-a8c03fe93a850caa.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 4173dfd6..405d885d 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 manila::keystone::authtoken( $password = $::os_service_default, $username = 'manila', @@ -212,6 +217,7 @@ class manila::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 ::manila::deps @@ -255,5 +261,6 @@ class manila::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-a8c03fe93a850caa.yaml b/releasenotes/notes/keystone-authtoken-interface-a8c03fe93a850caa.yaml new file mode 100644 index 00000000..e0223f0f --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-a8c03fe93a850caa.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``manila::keystone::authtoken::interface`` parameter has been added, + which can be used to set the interface parameter in authtoken middleware. diff --git a/spec/classes/manila_keystone_authtoken_spec.rb b/spec/classes/manila_keystone_authtoken_spec.rb index 49d0c1aa..42eb12e7 100644 --- a/spec/classes/manila_keystone_authtoken_spec.rb +++ b/spec/classes/manila_keystone_authtoken_spec.rb @@ -49,6 +49,7 @@ describe 'manila::keystone::authtoken' do is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_manila_config('keystone_authtoken/service_token_roles').with_value('') is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_manila_config('keystone_authtoken/interface').with_value('') end end @@ -89,6 +90,7 @@ describe 'manila::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :interface => 'internal', }) end @@ -126,6 +128,7 @@ describe 'manila::keystone::authtoken' do is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_manila_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_manila_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do