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: Ia78263a801dd920ded47c898800bc7f2fa88becc
This commit is contained in:
parent
a83b444303
commit
b249de4961
@ -48,7 +48,7 @@ class murano::db::mysql(
|
||||
|
||||
::openstacklib::db::mysql{ 'murano':
|
||||
user => $user,
|
||||
password_hash => mysql::password($password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
host => $host,
|
||||
charset => $charset,
|
||||
|
@ -48,7 +48,7 @@ class murano::db::mysql_cfapi(
|
||||
|
||||
::openstacklib::db::mysql{ 'murano_cfapi':
|
||||
user => $user,
|
||||
password_hash => mysql::password($password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
host => $host,
|
||||
charset => $charset,
|
||||
|
@ -37,7 +37,7 @@ class murano::db::postgresql(
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
::openstacklib::db::postgresql { 'murano':
|
||||
password_hash => postgresql_password($user, $password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
user => $user,
|
||||
encoding => $encoding,
|
||||
|
@ -37,7 +37,7 @@ class murano::db::postgresql_cfapi(
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
::openstacklib::db::postgresql { 'murano_cfapi':
|
||||
password_hash => postgresql_password($user, $password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
user => $user,
|
||||
encoding => $encoding,
|
||||
|
@ -13,10 +13,6 @@
|
||||
"name": "puppet/rabbitmq",
|
||||
"version_requirement": ">=8.4.0 <11.0.0"
|
||||
},
|
||||
{
|
||||
"name": "puppetlabs/mysql",
|
||||
"version_requirement": ">=6.0.0 <11.0.0"
|
||||
},
|
||||
{
|
||||
"name": "puppetlabs/stdlib",
|
||||
"version_requirement": ">=5.0.0 <7.0.0"
|
||||
|
@ -8,7 +8,7 @@ describe 'murano::db::mysql_cfapi' do
|
||||
|
||||
let :params do
|
||||
{ :dbname => 'murano_cfapi',
|
||||
:password => 's3cr3t',
|
||||
:password => 'muranopass',
|
||||
:user => 'murano_cfapi',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
@ -27,7 +27,7 @@ describe 'murano::db::mysql_cfapi' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset]
|
||||
)
|
||||
@ -44,7 +44,7 @@ describe 'murano::db::mysql_cfapi' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset],
|
||||
:allowed_hosts => ['127.0.0.1','%']
|
||||
@ -62,7 +62,7 @@ describe 'murano::db::mysql_cfapi' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano_cfapi').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset],
|
||||
:allowed_hosts => '192.168.1.1'
|
||||
|
@ -8,7 +8,7 @@ describe 'murano::db::mysql' do
|
||||
|
||||
let :params do
|
||||
{ :dbname => 'murano',
|
||||
:password => 's3cr3t',
|
||||
:password => 'muranopass',
|
||||
:user => 'murano',
|
||||
:charset => 'utf8',
|
||||
:collate => 'utf8_general_ci',
|
||||
@ -27,7 +27,7 @@ describe 'murano::db::mysql' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset]
|
||||
)
|
||||
@ -44,7 +44,7 @@ describe 'murano::db::mysql' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset],
|
||||
:allowed_hosts => ['127.0.0.1','%']
|
||||
@ -62,7 +62,7 @@ describe 'murano::db::mysql' do
|
||||
is_expected.to contain_openstacklib__db__mysql('murano').with(
|
||||
:user => params[:user],
|
||||
:dbname => params[:dbname],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset],
|
||||
:allowed_hosts => '192.168.1.1'
|
||||
|
@ -4,7 +4,7 @@ describe 'murano::db::postgresql_cfapi' do
|
||||
|
||||
shared_examples_for 'murano::db::postgresql_cfapi' do
|
||||
let :req_params do
|
||||
{ :password => 'pw' }
|
||||
{ :password => 'muranopass' }
|
||||
end
|
||||
|
||||
let :pre_condition do
|
||||
@ -16,9 +16,12 @@ describe 'murano::db::postgresql_cfapi' do
|
||||
req_params
|
||||
end
|
||||
|
||||
it { is_expected.to contain_postgresql__server__db('murano_cfapi').with(
|
||||
it { is_expected.to contain_openstacklib__db__postgresql('murano_cfapi').with(
|
||||
:user => 'murano_cfapi',
|
||||
:password => 'md594583175c7aca1cf386f1c97c50fda19'
|
||||
:password => 'muranopass',
|
||||
:dbname => 'murano_cfapi',
|
||||
:encoding => nil,
|
||||
:privileges => 'ALL',
|
||||
)}
|
||||
end
|
||||
|
||||
|
@ -4,7 +4,7 @@ describe 'murano::db::postgresql' do
|
||||
|
||||
shared_examples_for 'murano::db::postgresql' do
|
||||
let :req_params do
|
||||
{ :password => 'pw' }
|
||||
{ :password => 'muranopass' }
|
||||
end
|
||||
|
||||
let :pre_condition do
|
||||
@ -16,9 +16,12 @@ describe 'murano::db::postgresql' do
|
||||
req_params
|
||||
end
|
||||
|
||||
it { is_expected.to contain_postgresql__server__db('murano').with(
|
||||
it { is_expected.to contain_openstacklib__db__postgresql('murano').with(
|
||||
:user => 'murano',
|
||||
:password => 'md5c73cd23dae0b015e51ff2b38714d0bab'
|
||||
:password => 'muranopass',
|
||||
:dbname => 'murano',
|
||||
:encoding => nil,
|
||||
:privileges => 'ALL',
|
||||
)}
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user