From c415b7ab382d90cefeaedaa0e794ee7105c1b4d5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 25 Aug 2023 15:02:12 +0900 Subject: [PATCH] fetcher_keystone: Fix ignored auth_type The class parameter has been ignored and the given value was not put in the config file properly. This fixes the problem. Conflicts: manifests/fetcher/keystone.pp Change-Id: I764a98553b766e64fad71d418f4158a47e413282 (cherry picked from commit 4ae2f42a7af03b84540ccc9980fc9063bda221f4) (cherry picked from commit bf69e7526b6fef64b2019e89b0d3d24d45157554) --- manifests/fetcher/keystone.pp | 1 + spec/classes/cloudkitty_fetcher_keystone_spec.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/manifests/fetcher/keystone.pp b/manifests/fetcher/keystone.pp index 7680b1d..59208bc 100644 --- a/manifests/fetcher/keystone.pp +++ b/manifests/fetcher/keystone.pp @@ -97,6 +97,7 @@ class cloudkitty::fetcher::keystone ( 'fetcher_keystone/project_domain_name': value => $project_domain_name_real; 'fetcher_keystone/system_scope': value => $system_scope; 'fetcher_keystone/auth_url': value => $auth_url; + 'fetcher_keystone/auth_type': value => $auth_type; 'fetcher_keystone/keystone_version': value => $keystone_version_real; 'fetcher_keystone/ignore_rating_role': value => $ignore_rating_role; 'fetcher_keystone/ignore_disabled_tenants': value => $ignore_disabled_tenants; diff --git a/spec/classes/cloudkitty_fetcher_keystone_spec.rb b/spec/classes/cloudkitty_fetcher_keystone_spec.rb index 576cb47..6ca2be4 100644 --- a/spec/classes/cloudkitty_fetcher_keystone_spec.rb +++ b/spec/classes/cloudkitty_fetcher_keystone_spec.rb @@ -17,6 +17,7 @@ describe 'cloudkitty::fetcher::keystone' do is_expected.to contain_cloudkitty_config('fetcher_keystone/project_domain_name').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_url').with_value('') + is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_type').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_rating_role').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value('') @@ -33,6 +34,7 @@ describe 'cloudkitty::fetcher::keystone' do :user_domain_name => 'Default', :project_domain_name => 'Default', :auth_url => 'http://127.0.0.1:5000', + :auth_type => 'password', :keystone_version => 3, :ignore_rating_role => false, :ignore_disabled_tenants => true, @@ -48,6 +50,7 @@ describe 'cloudkitty::fetcher::keystone' do is_expected.to contain_cloudkitty_config('fetcher_keystone/project_domain_name').with_value('Default') is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('') is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_url').with_value('http://127.0.0.1:5000') + is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_type').with_value('password') is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value(3) is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_rating_role').with_value(false) is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value(true)