openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Remove password hash generation in each puppet modules"

This commit is contained in:
Zuul 2020-05-20 04:59:06 +00:00 committed by Gerrit Code Review
parent 2708fb59c4 7abf5d8d70
commit bbb8079bf3
5 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/mysql.pp
View File

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

2
manifests/db/powerdns/mysql.pp
View File

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

4
metadata.json
View File

@ -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"

35
spec/classes/designate_db_mysql_spec.rb
View File

@ -1,3 +1,4 @@
require 'spec_helper'
describe 'designate::db::mysql' do
@ -6,7 +7,7 @@ describe 'designate::db::mysql' do
end
let :required_params do
{ :password => "qwerty" }
{ :password => "designatepass" }
end
shared_examples_for 'designate-db-mysql' do
@ -16,35 +17,9 @@ describe 'designate::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('designate').with(
:user => 'designate',
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
: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'
:user => 'designate',
:password => 'designatepass',
:charset => 'utf8'
)}
end

8
spec/classes/designate_db_powerdns_mysql_spec.rb
View File

@ -7,7 +7,7 @@ describe 'designate::db::powerdns::mysql' do
end
let :required_params do
{ :password => "qwerty" }
{ :password => "designatepass" }
end
@ -18,9 +18,9 @@ describe 'designate::db::powerdns::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('powerdns').with(
:user => 'powerdns',
:password_hash => '*AA1420F182E88B9E5F874F6FBE7459291E8F4601',
:charset => 'utf8'
:user => 'powerdns',
:password => 'designatepass',
:charset => 'utf8'
)}
end