openstack/puppet-cloudkitty
Code Issues Proposed changes

fetcher_keystone: Fix ignored auth_type

Browse Source 
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 4ae2f42a7a)
(cherry picked from commit bf69e7526b)
This commit is contained in:
Takashi Kajinami
2023-08-25 15:02:12 +09:00
parent 2cfae1dd48
commit c415b7ab38
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/fetcher/keystone.pp
View File

@@ -97,6 +97,7 @@ class cloudkitty::fetcher::keystone (
'fetcher_keystone/project_domain_name': value => $project_domain_name_real; 'fetcher_keystone/project_domain_name': value => $project_domain_name_real;
'fetcher_keystone/system_scope': value => $system_scope; 'fetcher_keystone/system_scope': value => $system_scope;
'fetcher_keystone/auth_url': value => $auth_url; 'fetcher_keystone/auth_url': value => $auth_url;
'fetcher_keystone/auth_type': value => $auth_type;
'fetcher_keystone/keystone_version': value => $keystone_version_real; 'fetcher_keystone/keystone_version': value => $keystone_version_real;
'fetcher_keystone/ignore_rating_role': value => $ignore_rating_role; 'fetcher_keystone/ignore_rating_role': value => $ignore_rating_role;
'fetcher_keystone/ignore_disabled_tenants': value => $ignore_disabled_tenants; 'fetcher_keystone/ignore_disabled_tenants': value => $ignore_disabled_tenants;

3
spec/classes/cloudkitty_fetcher_keystone_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'cloudkitty::fetcher::keystone' do
is_expected.to contain_cloudkitty_config('fetcher_keystone/project_domain_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/project_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_url').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_rating_role').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_rating_role').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value('<SERVICE DEFAULT>')
@@ -33,6 +34,7 @@ describe 'cloudkitty::fetcher::keystone' do
:user_domain_name => 'Default', :user_domain_name => 'Default',
:project_domain_name => 'Default', :project_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:5000', :auth_url => 'http://127.0.0.1:5000',
:auth_type => 'password',
:keystone_version => 3, :keystone_version => 3,
:ignore_rating_role => false, :ignore_rating_role => false,
:ignore_disabled_tenants => true, :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/project_domain_name').with_value('Default')
is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('<SERVICE DEFAULT>') is_expected.to contain_cloudkitty_config('fetcher_keystone/system_scope').with_value('<SERVICE DEFAULT>')
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_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/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_rating_role').with_value(false)
is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value(true) is_expected.to contain_cloudkitty_config('fetcher_keystone/ignore_disabled_tenants').with_value(true)