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: Ie66552bc2a4447abca9d685e461ac3837568583d
This commit is contained in:
parent
0c24a3d532
commit
72718329e9
|
@ -49,7 +49,7 @@ class freezer::db::mysql(
|
|||
|
||||
::openstacklib::db::mysql { 'freezer':
|
||||
user => $user,
|
||||
password_hash => mysql::password($password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
host => $host,
|
||||
charset => $charset,
|
||||
|
|
|
@ -35,11 +35,11 @@ class freezer::db::postgresql(
|
|||
include freezer::deps
|
||||
|
||||
::openstacklib::db::postgresql { 'freezer':
|
||||
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['freezer::db::begin']
|
||||
|
|
|
@ -47,10 +47,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": ">=16.3.0 <17.0.0"
|
||||
|
|
|
@ -7,7 +7,7 @@ describe 'freezer::db::mysql' do
|
|||
end
|
||||
|
||||
let :required_params do
|
||||
{ :password => 'fooboozoo_default_password', }
|
||||
{ :password => 'freezerpass', }
|
||||
end
|
||||
|
||||
shared_examples_for 'freezer-db-mysql' do
|
||||
|
@ -17,12 +17,12 @@ describe 'freezer::db::mysql' do
|
|||
end
|
||||
|
||||
it { is_expected.to contain_openstacklib__db__mysql('freezer').with(
|
||||
:user => 'freezer',
|
||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
:user => 'freezer',
|
||||
:password => 'freezerpass',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
)}
|
||||
end
|
||||
|
||||
|
@ -32,13 +32,13 @@ describe 'freezer::db::mysql' do
|
|||
end
|
||||
|
||||
it { is_expected.to contain_openstacklib__db__mysql('freezer').with(
|
||||
:user => 'freezer',
|
||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
:allowed_hosts => ['127.0.0.1','%']
|
||||
:user => 'freezer',
|
||||
:password => 'freezerpass',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
:allowed_hosts => ['127.0.0.1','%']
|
||||
)}
|
||||
end
|
||||
|
||||
|
@ -48,13 +48,13 @@ describe 'freezer::db::mysql' do
|
|||
end
|
||||
|
||||
it { is_expected.to contain_openstacklib__db__mysql('freezer').with(
|
||||
:user => 'freezer',
|
||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
:allowed_hosts => '192.168.1.1'
|
||||
:user => 'freezer',
|
||||
:password => 'freezerpass',
|
||||
:dbname => 'freezer',
|
||||
:host => '127.0.0.1',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
:allowed_hosts => '192.168.1.1'
|
||||
)}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,7 +7,7 @@ describe 'freezer::db::postgresql' do
|
|||
end
|
||||
|
||||
let :required_params do
|
||||
{ :password => 'pw' }
|
||||
{ :password => 'freezerpass' }
|
||||
end
|
||||
|
||||
shared_examples_for 'freezer-db-postgresql' do
|
||||
|
@ -16,9 +16,12 @@ describe 'freezer::db::postgresql' do
|
|||
required_params
|
||||
end
|
||||
|
||||
it { is_expected.to contain_postgresql__server__db('freezer').with(
|
||||
:user => 'freezer',
|
||||
:password => 'md55e34e2e3dc142b2c2238132885361a42'
|
||||
it { is_expected.to contain_openstacklib__db__postgresql('freezer').with(
|
||||
:user => 'freezer',
|
||||
:password => 'freezerpass',
|
||||
:dbname => 'freezer',
|
||||
:encoding => nil,
|
||||
:privileges => 'ALL',
|
||||
)}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue