openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Remove password hash generation in each puppet modules"

This commit is contained in:
Zuul 2020-05-20 05:31:04 +00:00 committed by Gerrit Code Review
parent ba217271cb 1015639de8
commit 8e4c57b6a3
5 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/db/mysql.pp
View File

@ -46,7 +46,7 @@ class glance::db::mysql(
::openstacklib::db::mysql { 'glance':
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 glance::db::postgresql(
include glance::deps
::openstacklib::db::postgresql { 'glance':
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['glance::db::begin']

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"

36
spec/classes/glance_db_mysql_spec.rb
View File

@ -14,9 +14,9 @@ describe 'glance::db::mysql' do
end
it { is_expected.to contain_openstacklib__db__mysql('glance').with(
:password_hash => '*41C910F70EB213CF4CB7B2F561B4995503C0A87B',
:charset => 'utf8',
:collate => 'utf8_general_ci',
:password => 'glancepass1',
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end
@ -24,16 +24,16 @@ describe 'glance::db::mysql' do
describe "overriding default params" do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:charset => 'utf8',
:password => 'glancepass2',
:dbname => 'glancedb2',
:charset => 'utf8',
}
end
it { is_expected.to contain_openstacklib__db__mysql('glance').with(
:password_hash => '*6F9A1CB9BD83EE06F3903BDFF9F4188764E694CA',
:dbname => 'glancedb2',
:charset => 'utf8'
:password => 'glancepass2',
:dbname => 'glancedb2',
:charset => 'utf8'
)}
end
@ -41,9 +41,9 @@ describe 'glance::db::mysql' do
describe "overriding allowed_hosts param to array" do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => ['127.0.0.1','%']
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => ['127.0.0.1','%']
}
end
@ -52,9 +52,9 @@ describe 'glance::db::mysql' do
describe "overriding allowed_hosts param to string" do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '192.168.1.1'
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '192.168.1.1'
}
end
@ -63,9 +63,9 @@ describe 'glance::db::mysql' do
describe "overriding allowed_hosts param equals to host param " do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '127.0.0.1'
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '127.0.0.1'
}
end
end

11
spec/classes/glance_db_postgresql_spec.rb
View File

@ -4,7 +4,7 @@ describe 'glance::db::postgresql' do
shared_examples_for 'glance::db::postgresql' do
let :req_params do
{ :password => 'pw' }
{ :password => 'glancepass' }
end
let :pre_condition do
@ -16,9 +16,12 @@ describe 'glance::db::postgresql' do
req_params
end
it { is_expected.to contain_postgresql__server__db('glance').with(
:user => 'glance',
:password => 'md56c7c03b193c2c1e0667bc5bd891703db'
it { is_expected.to contain_openstacklib__db__postgresql('glance').with(
:user => 'glance',
:password => 'glancepass',
:dbname => 'glance',
:encoding => nil,
:privileges => 'ALL',
)}
end
end