openstack
/
puppet-cloudkitty
Code Issues Proposed changes

Merge "Globally support system scope credentials"

This commit is contained in:
Zuul 2022-03-11 10:50:03 +00:00 committed by Gerrit Code Review
parent 93bdf62a48 0b08499e20
commit a4a9be8dee
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/fetcher/keystone.pp
View File

@ -33,6 +33,10 @@
# (Optional) Name of domain for $project_name
# Defaults to $::os_service_default.
#
# [*system_scope*]
# (Optional) Scope for system operations.
# Defaults to $::os_service_default
#
# [*auth_type*]
# (Optional) An authentication type to use with an OpenStack Identity server.
# Defaults to $::os_service_default.
@ -57,6 +61,7 @@ class cloudkitty::fetcher::keystone (
$project_name = $::os_service_default,
$user_domain_name = $::os_service_default,
$project_domain_name = $::os_service_default,
$system_scope = $::os_service_default,
$auth_type = $::os_service_default,
$keystone_version = $::os_service_default,
$ignore_rating_role = $::os_service_default,
@ -75,13 +80,22 @@ class cloudkitty::fetcher::keystone (
}
$keystone_version_real = pick($::cloudkitty::keystone_version, $keystone_version)
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
} else {
$project_name_real = $::os_service_default
$project_domain_name_real = $::os_service_default
}
cloudkitty_config {
'fetcher_keystone/auth_section': value => $auth_section_real;
'fetcher_keystone/username': value => $username;
'fetcher_keystone/password': value => $password, secret => true;
'fetcher_keystone/project_name': value => $project_name;
'fetcher_keystone/project_name': value => $project_name_real;
'fetcher_keystone/user_domain_name': value => $user_domain_name;
'fetcher_keystone/project_domain_name': value => $project_domain_name;
'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/keystone_version': value => $keystone_version_real;
'fetcher_keystone/ignore_rating_role': value => $ignore_rating_role;

5
releasenotes/notes/system_scope-all-e10d75a9bb941df6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The `cloudkitty::fetcher::keystone::system_scope`` parameter has been
added.

17
spec/classes/cloudkitty_fetcher_keystone_spec.rb
View File

@ -15,6 +15,7 @@ describe 'cloudkitty::fetcher::keystone' do
is_expected.to contain_cloudkitty_config('fetcher_keystone/project_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('fetcher_keystone/user_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/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>')
@ -45,12 +46,28 @@ describe 'cloudkitty::fetcher::keystone' do
is_expected.to contain_cloudkitty_config('fetcher_keystone/project_name').with_value('service')
is_expected.to contain_cloudkitty_config('fetcher_keystone/user_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/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
context 'when system_scope is set' do
let :params do
{
:project_name => 'service',
:project_domain_name => 'Default',
:system_scope => 'all'
}
end
it 'configures system-scoped credential' do
is_expected.to contain_cloudkitty_config('fetcher_keystone/project_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('all')
end
end
end
on_supported_os({