Merge "Remove password hash generation in each puppet modules"
This commit is contained in:
commit
ea08b17acb
|
@ -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,
|
||||
|
|
|
@ -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']
|
||||
|
|
|
@ -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": ">=17.0.0 <18.0.0"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue