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: I037632b6f06907c62be7e94f50b94c08ac6ab051
This commit is contained in:
parent
4a1a931c49
commit
7abf5d8d70
|
@ -45,7 +45,7 @@ class designate::db::mysql(
|
||||||
|
|
||||||
::openstacklib::db::mysql { 'designate':
|
::openstacklib::db::mysql { 'designate':
|
||||||
user => $user,
|
user => $user,
|
||||||
password_hash => mysql::password($password),
|
password => $password,
|
||||||
dbname => $dbname,
|
dbname => $dbname,
|
||||||
host => $host,
|
host => $host,
|
||||||
charset => $charset,
|
charset => $charset,
|
||||||
|
|
|
@ -45,7 +45,7 @@ class designate::db::powerdns::mysql (
|
||||||
|
|
||||||
::openstacklib::db::mysql { 'powerdns':
|
::openstacklib::db::mysql { 'powerdns':
|
||||||
user => $user,
|
user => $user,
|
||||||
password_hash => mysql::password($password),
|
password => $password,
|
||||||
dbname => $dbname,
|
dbname => $dbname,
|
||||||
host => $host,
|
host => $host,
|
||||||
charset => $charset,
|
charset => $charset,
|
||||||
|
|
|
@ -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": "puppetlabs/stdlib",
|
"name": "puppetlabs/stdlib",
|
||||||
"version_requirement": ">=5.0.0 <7.0.0"
|
"version_requirement": ">=5.0.0 <7.0.0"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'designate::db::mysql' do
|
describe 'designate::db::mysql' do
|
||||||
|
|
||||||
|
@ -6,7 +7,7 @@ describe 'designate::db::mysql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :required_params do
|
let :required_params do
|
||||||
{ :password => "qwerty" }
|
{ :password => "designatepass" }
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'designate-db-mysql' do
|
shared_examples_for 'designate-db-mysql' do
|
||||||
|
@ -16,35 +17,9 @@ describe 'designate::db::mysql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('designate').with(
|
it { is_expected.to contain_openstacklib__db__mysql('designate').with(
|
||||||
:user => 'designate',
|
:user => 'designate',
|
||||||
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
:password => 'designatepass',
|
||||||
:charset => 'utf8'
|
:charset => 'utf8'
|
||||||
)}
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when overriding charset' do
|
|
||||||
let :params do
|
|
||||||
{ :charset => 'latin1' }.merge(required_params)
|
|
||||||
end
|
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('designate').with_charset(params[:charset]) }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'on a RedHat osfamily' do
|
|
||||||
let :facts do
|
|
||||||
{ :osfamily => 'RedHat' }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with only required parameters' do
|
|
||||||
let :params do
|
|
||||||
required_params
|
|
||||||
end
|
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('designate').with(
|
|
||||||
:user => 'designate',
|
|
||||||
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
|
||||||
:charset => 'utf8'
|
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe 'designate::db::powerdns::mysql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
let :required_params do
|
let :required_params do
|
||||||
{ :password => "qwerty" }
|
{ :password => "designatepass" }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@ describe 'designate::db::powerdns::mysql' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_openstacklib__db__mysql('powerdns').with(
|
it { is_expected.to contain_openstacklib__db__mysql('powerdns').with(
|
||||||
:user => 'powerdns',
|
:user => 'powerdns',
|
||||||
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
|
:password => 'designatepass',
|
||||||
:charset => 'utf8'
|
:charset => 'utf8'
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue