openstack/puppet-cloudkitty
Code Issues Proposed changes

Merge "Support more [fetcher_keystone] parameters"

Browse Source
This commit is contained in:
Zuul
2022-01-26 15:07:25 +00:00
committed by Gerrit Code Review
parent 6a859da4bc d9d0ab9923
commit c4c41a75cd
3 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/fetcher/keystone.pp
View File

@@ -39,7 +39,15 @@
#
# [*keystone_version*]
# (Optional) Keystone version to use.
# Defaults to $::os_service_defaul.
# Defaults to $::os_service_default.
#
# [*ignore_rating_role*]
# (Optional) Skip rating role check for cloudkitty user.
# Defaults to $::os_service_default.
#
# [*ignore_disabled_tenants*]
# (Optional) Stop rating disabled tenants.
# Defaults to $::os_service_default.
#
class cloudkitty::fetcher::keystone (
$auth_section = undef,
@@ -51,6 +59,8 @@ class cloudkitty::fetcher::keystone (
$project_domain_name = $::os_service_default,
$auth_type = $::os_service_default,
$keystone_version = $::os_service_default,
$ignore_rating_role = $::os_service_default,
$ignore_disabled_tenants = $::os_service_default,
) {
include cloudkitty::deps
@@ -74,5 +84,7 @@ class cloudkitty::fetcher::keystone (
'fetcher_keystone/project_domain_name': value => $project_domain_name;
'fetcher_keystone/auth_url': value => $auth_url;
'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;
}
}

5
releasenotes/notes/fetcher_keystone-opts-ffd8b0a4a26f7a0a.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
The ``ignore_rating_role`` parameter and the ``ignore_disabled_tenants``
parameter has been added to the ``cloudkitty::fetcher::keystone`` class.

6
spec/classes/cloudkitty_fetcher_keystone_spec.rb
View File

@@ -17,6 +17,8 @@ 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/auth_url').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_disabled_tenants').with_value('<SERVICE DEFAULT>')
end
end
@@ -31,6 +33,8 @@ describe 'cloudkitty::fetcher::keystone' do
:project_domain_name => 'Default',
:auth_url => 'http://127.0.0.1:5000',
:keystone_version => 3,
:ignore_rating_role => false,
:ignore_disabled_tenants => true,
}
end
@@ -43,6 +47,8 @@ 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/auth_url').with_value('http://127.0.0.1:5000')
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)
end
end
end