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: I79f49b3c39283e75a2cfeb753d73dfcb642910aa
This commit is contained in:
parent
9c707559a2
commit
e0336e6ced
|
@ -49,7 +49,7 @@ class congress::db::mysql(
|
||||||
|
|
||||||
::openstacklib::db::mysql { 'congress':
|
::openstacklib::db::mysql { 'congress':
|
||||||
user => $user,
|
user => $user,
|
||||||
password_hash => mysql::password($password),
|
password => $password,
|
||||||
dbname => $dbname,
|
dbname => $dbname,
|
||||||
host => $host,
|
host => $host,
|
||||||
charset => $charset,
|
charset => $charset,
|
||||||
|
|
|
@ -35,11 +35,11 @@ class congress::db::postgresql(
|
||||||
include congress::deps
|
include congress::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'congress':
|
::openstacklib::db::postgresql { 'congress':
|
||||||
password_hash => postgresql_password($user, $password),
|
password => $password,
|
||||||
dbname => $dbname,
|
dbname => $dbname,
|
||||||
user => $user,
|
user => $user,
|
||||||
encoding => $encoding,
|
encoding => $encoding,
|
||||||
privileges => $privileges,
|
privileges => $privileges,
|
||||||
}
|
}
|
||||||
|
|
||||||
Anchor['congress::db::begin']
|
Anchor['congress::db::begin']
|
||||||
|
|
|
@ -13,10 +13,6 @@
|
||||||
"name": "puppet/rabbitmq",
|
"name": "puppet/rabbitmq",
|
||||||
"version_requirement": ">=8.4.0 <11.0.0"
|
"version_requirement": ">=8.4.0 <11.0.0"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "puppetlabs/mysql",
|
|
||||||
"version_requirement": ">=6.0.0 <11.0.0"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "openstack/openstacklib",
|
"name": "openstack/openstacklib",
|
||||||
"version_requirement": ">=16.3.0 <17.0.0"
|
"version_requirement": ">=16.3.0 <17.0.0"
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe 'congress::db::mysql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :required_params do
|
let :required_params do
|
||||||
{ :password => 'fooboozoo_default_password', }
|
{ :password => 'congresspass', }
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'congress-db-mysql' do
|
shared_examples_for 'congress-db-mysql' do
|
||||||
|
@ -18,7 +18,7 @@ describe 'congress::db::mysql' do
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
||||||
:user => 'congress',
|
:user => 'congress',
|
||||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
:password => 'congresspass',
|
||||||
:dbname => 'congress',
|
:dbname => 'congress',
|
||||||
:host => '127.0.0.1',
|
:host => '127.0.0.1',
|
||||||
:charset => 'utf8',
|
:charset => 'utf8',
|
||||||
|
@ -33,7 +33,7 @@ describe 'congress::db::mysql' do
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
||||||
:user => 'congress',
|
:user => 'congress',
|
||||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
:password => 'congresspass',
|
||||||
:dbname => 'congress',
|
:dbname => 'congress',
|
||||||
:host => '127.0.0.1',
|
:host => '127.0.0.1',
|
||||||
:charset => 'utf8',
|
:charset => 'utf8',
|
||||||
|
@ -49,7 +49,7 @@ describe 'congress::db::mysql' do
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
it { is_expected.to contain_openstacklib__db__mysql('congress').with(
|
||||||
:user => 'congress',
|
:user => 'congress',
|
||||||
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
|
:password => 'congresspass',
|
||||||
:dbname => 'congress',
|
:dbname => 'congress',
|
||||||
:host => '127.0.0.1',
|
:host => '127.0.0.1',
|
||||||
:charset => 'utf8',
|
:charset => 'utf8',
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe 'congress::db::postgresql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :required_params do
|
let :required_params do
|
||||||
{ :password => 'pw' }
|
{ :password => 'congresspass' }
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'congress-db-postgresql' do
|
shared_examples_for 'congress-db-postgresql' do
|
||||||
|
@ -16,9 +16,12 @@ describe 'congress::db::postgresql' do
|
||||||
required_params
|
required_params
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_postgresql__server__db('congress').with(
|
it { is_expected.to contain_openstacklib__db__postgresql('congress').with(
|
||||||
:user => 'congress',
|
:user => 'congress',
|
||||||
:password => 'md5a2f665ba4d66aae91c2a86eedd8e564e'
|
:password => 'congresspass',
|
||||||
|
:dbname => 'congress',
|
||||||
|
:encoding => nil,
|
||||||
|
:privileges => 'ALL',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue