From ea090a675f7ea7de5525638959cb7fe99dd2f814 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 9 Jul 2020 08:34:26 +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: I02f2b0cfe4641616a59043c947c65d373597da55 (cherry picked from commit 3ac484f1d2aa0e84997cfddcb63d343cbda9a25b) (cherry picked from commit 53b48ba1f7134d21630fb321f49411367a229207) --- manifests/keystone/authtoken.pp | 7 +++++++ .../keystone-authtoken-interface-c06d43b518a9dd80.yaml | 6 ++++++ spec/classes/gnocchi_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/keystone-authtoken-interface-c06d43b518a9dd80.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 620634b6..292e570c 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 gnocchi::keystone::authtoken( $username = 'gnocchi', $password = $::os_service_default, @@ -212,6 +217,7 @@ class gnocchi::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 ::gnocchi::deps @@ -255,5 +261,6 @@ class gnocchi::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-c06d43b518a9dd80.yaml b/releasenotes/notes/keystone-authtoken-interface-c06d43b518a9dd80.yaml new file mode 100644 index 00000000..fa6d7875 --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-c06d43b518a9dd80.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new ``gnocchi::keystone::authtoken::interface`` parameter has been + added, which can be used to set the interface parameter in authtoken + middleware. diff --git a/spec/classes/gnocchi_keystone_authtoken_spec.rb b/spec/classes/gnocchi_keystone_authtoken_spec.rb index b9b18a69..cf94b51c 100644 --- a/spec/classes/gnocchi_keystone_authtoken_spec.rb +++ b/spec/classes/gnocchi_keystone_authtoken_spec.rb @@ -44,6 +44,7 @@ describe 'gnocchi::keystone::authtoken' do is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value('') is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_gnocchi_config('keystone_authtoken/interface').with_value('') end end @@ -84,6 +85,7 @@ describe 'gnocchi::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :interface => 'internal', }) end @@ -121,6 +123,7 @@ describe 'gnocchi::keystone::authtoken' do is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_gnocchi_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do