openstack
/
puppet-gnocchi
Code Issues Proposed changes

Merge "Remove password hash generation in each puppet modules"

This commit is contained in:
Zuul 2020-05-20 04:32:02 +00:00 committed by Gerrit Code Review
parent 5f9181cc6b 9f299497b5
commit edfe087a8d
5 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/mysql.pp
View File

@ -49,7 +49,7 @@ class gnocchi::db::mysql(
::openstacklib::db::mysql { 'gnocchi':
user => $user,
password_hash => mysql::password($password),
password => $password,
dbname => $dbname,
host => $host,
charset => $charset,

10
manifests/db/postgresql.pp
View File

@ -35,11 +35,11 @@ class gnocchi::db::postgresql(
include gnocchi::deps
::openstacklib::db::postgresql { 'gnocchi':
password_hash => postgresql_password($user, $password),
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
password => $password,
dbname => $dbname,
user => $user,
encoding => $encoding,
privileges => $privileges,
}
Anchor['gnocchi::db::begin']

4
metadata.json
View File

@ -13,10 +13,6 @@
"name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <7.0.0"
},
{
"name": "puppetlabs/mysql",
"version_requirement": ">=6.0.0 <11.0.0"
},
{
"name": "openstack/openstacklib",
"version_requirement": ">=17.0.0 <18.0.0"

42
spec/classes/gnocchi_db_mysql_spec.rb
View File

@ -14,9 +14,9 @@ describe 'gnocchi::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('gnocchi').with(
:password_hash => '*C13FFB03C3674F278DF1673D0DA7FB1EF58899F0',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:password => 'gnocchipass1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end
@ -24,16 +24,16 @@ describe 'gnocchi::db::mysql' do
describe "overriding default params" do
let :params do
{
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:charset => 'utf8',
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:charset => 'utf8',
}
end
it { is_expected.to contain_openstacklib__db__mysql('gnocchi').with(
:password_hash => '*CE931F98EEC20A712654BF67B17E413F3FE69089',
:dbname => 'gnocchidb2',
:charset => 'utf8'
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:charset => 'utf8'
)}
end
@ -41,14 +41,14 @@ describe 'gnocchi::db::mysql' do
describe "overriding allowed_hosts param to array" do
let :params do
{
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => ['127.0.0.1','%']
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => ['127.0.0.1','%']
}
end
it { is_expected.to contain_openstacklib__db__mysql('gnocchi').with(
:password_hash => '*CE931F98EEC20A712654BF67B17E413F3FE69089',
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => ['127.0.0.1','%']
)}
@ -58,14 +58,14 @@ describe 'gnocchi::db::mysql' do
describe "overriding allowed_hosts param to string" do
let :params do
{
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '192.168.1.1'
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '192.168.1.1'
}
end
it { is_expected.to contain_openstacklib__db__mysql('gnocchi').with(
:password_hash => '*CE931F98EEC20A712654BF67B17E413F3FE69089',
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '192.168.1.1'
)}
@ -74,14 +74,14 @@ describe 'gnocchi::db::mysql' do
describe "overriding allowed_hosts param equals to host param " do
let :params do
{
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '127.0.0.1'
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '127.0.0.1'
}
end
it { is_expected.to contain_openstacklib__db__mysql('gnocchi').with(
:password_hash => '*CE931F98EEC20A712654BF67B17E413F3FE69089',
:password => 'gnocchipass2',
:dbname => 'gnocchidb2',
:allowed_hosts => '127.0.0.1'
)}

18
spec/classes/gnocchi_db_postgresql_spec.rb
View File

@ -4,7 +4,7 @@ describe 'gnocchi::db::postgresql' do
shared_examples_for 'gnocchi::db::postgresql' do
let :req_params do
{ :password => 'pw' }
{ :password => 'gnocchipass' }
end
let :pre_condition do
@ -16,11 +16,15 @@ describe 'gnocchi::db::postgresql' do
req_params
end
it { is_expected.to contain_postgresql__server__db('gnocchi').with(
:user => 'gnocchi',
:password => 'md590440288cb225f56d585b88ad270cd37'
it { is_expected.to contain_openstacklib__db__postgresql('gnocchi').with(
:user => 'gnocchi',
:password => 'gnocchipass',
:dbname => 'gnocchi',
:encoding => nil,
:privileges => 'ALL',
)}
end
end
on_supported_os({
@ -28,10 +32,14 @@ describe 'gnocchi::db::postgresql' do
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({ :concat_basedir => '/var/lib/puppet/concat' }))
facts.merge(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
}))
end
it_configures 'gnocchi::db::postgresql'
end
end
end