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: I1fe4c1eed71e9b4ca977b206edefbd0c700af74d
This commit is contained in:
Takashi Kajinami 2020-05-16 09:19:48 +09:00
parent 3e93ec2afa
commit b046aa43ea
5 changed files with 27 additions and 30 deletions

View File

@ -49,7 +49,7 @@ class aodh::db::mysql(
openstacklib::db::mysql { 'aodh': openstacklib::db::mysql { 'aodh':
user => $user, user => $user,
password_hash => mysql::password($password), password => $password,
dbname => $dbname, dbname => $dbname,
host => $host, host => $host,
charset => $charset, charset => $charset,

View File

@ -35,11 +35,11 @@ class aodh::db::postgresql(
include aodh::deps include aodh::deps
openstacklib::db::postgresql { 'aodh': openstacklib::db::postgresql { 'aodh':
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['aodh::db::begin'] Anchor['aodh::db::begin']

View File

@ -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/keystone", "name": "openstack/keystone",
"version_requirement": ">=16.3.0 <17.0.0" "version_requirement": ">=16.3.0 <17.0.0"

View File

@ -11,49 +11,47 @@ describe 'aodh::db::mysql' do
let :params do let :params do
{ {
'password' => 'fooboozoo_default_password', 'password' => 'aodhpass',
} }
end end
shared_examples_for 'aodh::db::mysql' do shared_examples_for 'aodh::db::mysql' do
context 'with only required params' do context 'with only required params' do
it { is_expected.to contain_openstacklib__db__mysql('aodh').with( it { is_expected.to contain_openstacklib__db__mysql('aodh').with(
'user' => 'aodh', 'user' => 'aodh',
'password_hash' => '*3DDF34A86854A312A8E2C65B506E21C91800D206', 'password' => 'aodhpass',
'dbname' => 'aodh', 'dbname' => 'aodh',
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'charset' => 'utf8', 'charset' => 'utf8',
:collate => 'utf8_general_ci', :collate => 'utf8_general_ci',
)} )}
end end
context "overriding allowed_hosts param to array" do context "overriding allowed_hosts param to array" do
let :params do let :params do
{ {
:password => 'aodhpass', :password => 'aodhpass',
:allowed_hosts => ['127.0.0.1','%'] :allowed_hosts => ['127.0.0.1','%']
} }
end end
end end
context "overriding allowed_hosts param to string" do context "overriding allowed_hosts param to string" do
let :params do let :params do
{ {
:password => 'aodhpass2', :password => 'aodhpass2',
:allowed_hosts => '192.168.1.1' :allowed_hosts => '192.168.1.1'
} }
end end
end end
context "overriding allowed_hosts param equals to host param " do context "overriding allowed_hosts param equals to host param " do
let :params do let :params do
{ {
:password => 'aodhpass2', :password => 'aodhpass2',
:allowed_hosts => '127.0.0.1' :allowed_hosts => '127.0.0.1'
} }
end end
end end
end end

View File

@ -3,7 +3,7 @@ require 'spec_helper'
describe 'aodh::db::postgresql' do describe 'aodh::db::postgresql' do
let :req_params do let :req_params do
{ :password => 'pw' } { :password => 'aodhpass' }
end end
let :pre_condition do let :pre_condition do
@ -16,9 +16,12 @@ describe 'aodh::db::postgresql' do
req_params req_params
end end
it { is_expected.to contain_postgresql__server__db('aodh').with( it { is_expected.to contain_openstacklib__db__postgresql('aodh').with(
:user => 'aodh', :user => 'aodh',
:password => 'md534e5dd092d680f3d8c11c62951fb5c19' :password => 'aodhpass',
:dbname => 'aodh',
:encoding => nil,
:privileges => 'ALL',
)} )}
end end