openstack
/
puppet-gnocchi
Code Issues Proposed changes

Merge "Use a 'params' hash for authtoken parameters"

This commit is contained in:
Zuul 2021-09-08 02:00:40 +00:00 committed by Gerrit Code Review
parent f0371cecf2 0fc62d135a
commit 21dbac03d5
2 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/authtoken.pp
View File

@ -187,6 +187,10 @@
# "public", "internal" or "admin".
# Defaults to $::os_service_default.
#
# [*params*]
# (Optional) Hash of additional parameters to pass through to the keystone
# authtoken class. Values set here override the individual parameters above.
#
class gnocchi::keystone::authtoken(
$username = 'gnocchi',
$password = $::os_service_default,
@ -224,6 +228,7 @@ class gnocchi::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
$params = {}
) {
include gnocchi::deps
@ -232,7 +237,10 @@ class gnocchi::keystone::authtoken(
fail('Please set password for Gnocchi service user')
}
keystone::resource::authtoken { 'gnocchi_config':
keystone::resource::authtoken {
'gnocchi_config':
* => $params;
default:
username => $username,
password => $password,
project_name => $project_name,
@ -268,6 +276,6 @@ class gnocchi::keystone::authtoken(
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
service_type => $service_type,
interface => $interface,
interface => $interface;
}
}

12
spec/classes/gnocchi_keystone_authtoken_spec.rb
View File

@ -133,6 +133,18 @@ describe 'gnocchi::keystone::authtoken' do
is_expected.to contain_package('python-memcache')
end
end
context 'when overriding parameters via params hash' do
before do
params.merge!({
:username => 'myuser',
:params => { 'username' => 'myotheruser' },
})
end
it 'configure keystone_authtoken' do
is_expected.to contain_gnocchi_config('keystone_authtoken/username').with_value(params[:params]['username'])
end
end
end
on_supported_os({