openstack/puppet-placement
Code Issues Proposed changes

Merge "Remove password hash generation in each puppet modules"

Browse Source
This commit is contained in:
Zuul 2020-05-20 04:57:21 +00:00 committed by Gerrit Code Review
commit 7e17c3db09
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 placement::db::mysql(
::openstacklib::db::mysql { 'placement':
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 placement::db::postgresql(
include placement::deps
::openstacklib::db::postgresql { 'placement':
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['placement::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": ">=17.0.0 <18.0.0"

42
spec/classes/placement_db_mysql_spec.rb
View File

@ -7,19 +7,19 @@ describe 'placement::db::mysql' do
let :params do
{
:password => 'fooboozoo_default_password',
:password => 'placementpass',
}
end
shared_examples 'placement::db::mysql' do
context 'with only required params' do
it { should contain_openstacklib__db__mysql('placement').with(
:user => 'placement',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:user => 'placement',
:password => 'placementpass',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end
@ -29,13 +29,13 @@ describe 'placement::db::mysql' do
end
it { should contain_openstacklib__db__mysql('placement').with(
:user => 'placement',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => ['127.0.0.1','%']
:user => 'placement',
:password => 'placementpass',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => ['127.0.0.1','%']
)}
end
@ -45,13 +45,13 @@ describe 'placement::db::mysql' do
end
it { should contain_openstacklib__db__mysql('placement').with(
:user => 'placement',
:password_hash => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => '192.168.1.1'
:user => 'placement',
:password => 'placementpass',
:dbname => 'placement',
:host => '127.0.0.1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:allowed_hosts => '192.168.1.1'
)}
end
end

11
spec/classes/placement_db_postgresql_spec.rb
View File

@ -7,15 +7,18 @@ describe 'placement::db::postgresql' do
let :params do
{
:password => 'pw'
:password => 'placementpass'
}
end
shared_examples 'placement::db::postgresql' do
context 'with only required parameters' do
it { should contain_postgresql__server__db('placement').with(
:user => 'placement',
:password => 'md51c1dd6fb4863b046eecc6a6b91f53f7f'
it { is_expected.to contain_openstacklib__db__postgresql('placement').with(
:user => 'placement',
:password => 'placementpass',
:dbname => 'placement',
:encoding => nil,
:privileges => 'ALL',
)}
end
end