openstack
/
puppet-panko
Code Issues Proposed changes

Remove password hash generation in each puppet modules 

... and migrate it to openstacklib so that all logics about database
configuration are implemented in one common place.

Depends-on: https://review.opendev.org/#/c/728595/
Change-Id: I44a6d9cd88460074b2136b9039394db584cd20b7
This commit is contained in:
Takashi Kajinami 2020-05-19 20:34:07 +09:00
parent 6be92c3b24
commit d469a553eb
5 changed files with 34 additions and 35 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 panko::db::mysql(
::openstacklib::db::mysql { 'panko':
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 panko::db::postgresql(
include panko::deps
::openstacklib::db::postgresql { 'panko':
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['panko::db::begin']

4
metadata.json
View File

@ -9,10 +9,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/keystone",
"version_requirement": ">=16.3.0 <17.0.0"

42
spec/classes/panko_db_mysql_spec.rb
View File

@ -7,7 +7,7 @@ describe 'panko::db::mysql' do
end
let :required_params do
{ :password => 'fooboozoo_default_password', }
{ :password => 'pankopass', }
end
shared_examples_for 'panko-db-mysql' do
@ -17,12 +17,12 @@ describe 'panko::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('panko').with(
:user => 'panko',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:user => 'panko',
:password => 'pankopass',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end
@ -32,13 +32,13 @@ describe 'panko::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('panko').with(
:user => 'panko',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => ['127.0.0.1','%']
:user => 'panko',
:password => 'pankopass',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => ['127.0.0.1','%']
)}
end
@ -48,13 +48,13 @@ describe 'panko::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('panko').with(
:user => 'panko',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => '192.168.1.1'
:user => 'panko',
:password => 'pankopass',
:dbname => 'panko',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => '192.168.1.1'
)}
end
end

11
spec/classes/panko_db_postgresql_spec.rb
View File

@ -7,7 +7,7 @@ describe 'panko::db::postgresql' do
end
let :required_params do
{ :password => 'pw' }
{ :password => 'pankopass' }
end
shared_examples_for 'panko-db-postgresql' do
@ -16,9 +16,12 @@ describe 'panko::db::postgresql' do
required_params
end
it { is_expected.to contain_postgresql__server__db('panko').with(
:user => 'panko',
:password => 'md558cac1b05100d25689b06310945fc3b4'
it { is_expected.to contain_openstacklib__db__postgresql('panko').with(
:user => 'panko',
:password => 'pankopass',
:dbname => 'panko',
:encoding => nil,
:privileges => 'ALL',
)}
end
end