Merge "Remove password hash generation in each puppet modules"
This commit is contained in:
commit
04ede22a15
|
@ -49,7 +49,7 @@ class heat::db::mysql(
|
|||
|
||||
::openstacklib::db::mysql { 'heat':
|
||||
user => $user,
|
||||
password_hash => mysql::password($password),
|
||||
password => $password,
|
||||
dbname => $dbname,
|
||||
host => $host,
|
||||
charset => $charset,
|
||||
|
|
|
@ -35,11 +35,11 @@ class heat::db::postgresql(
|
|||
include heat::deps
|
||||
|
||||
::openstacklib::db::postgresql { 'heat':
|
||||
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['heat::db::begin']
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -3,7 +3,7 @@ require 'spec_helper'
|
|||
describe 'heat::db::mysql' do
|
||||
|
||||
let :params do
|
||||
{ :password => 's3cr3t',
|
||||
{ :password => 'heatpass',
|
||||
:dbname => 'heat',
|
||||
:user => 'heat',
|
||||
:host => 'localhost',
|
||||
|
@ -22,10 +22,10 @@ describe 'heat::db::mysql' do
|
|||
it 'creates a mysql database' do
|
||||
is_expected.to contain_openstacklib__db__mysql( params[:dbname] ).with(
|
||||
:user => params[:user],
|
||||
:password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
|
||||
:password => params[:password],
|
||||
:host => params[:host],
|
||||
:charset => params[:charset],
|
||||
:collate => 'utf8_general_ci',
|
||||
:collate => params[:collate],
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,17 +1,14 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'heat::db::postgresql' do
|
||||
|
||||
shared_examples_for 'heat::db::postgresql' do
|
||||
let :req_params do
|
||||
{ :password => 'pw' }
|
||||
{ :password => 'heatpass' }
|
||||
end
|
||||
|
||||
let :pre_condition do
|
||||
"include postgresql::server
|
||||
class { 'heat::keystone::authtoken':
|
||||
password => 'password',
|
||||
}
|
||||
include heat"
|
||||
'include postgresql::server'
|
||||
end
|
||||
|
||||
context 'with only required parameters' do
|
||||
|
@ -19,9 +16,12 @@ describe 'heat::db::postgresql' do
|
|||
req_params
|
||||
end
|
||||
|
||||
it { is_expected.to contain_postgresql__server__db('heat').with(
|
||||
:user => 'heat',
|
||||
:password => 'md5fd5c4fca491370aab732f903e2fb7c99'
|
||||
it { is_expected.to contain_openstacklib__db__postgresql('heat').with(
|
||||
:user => 'heat',
|
||||
:password => 'heatpass',
|
||||
:dbname => 'heat',
|
||||
:encoding => nil,
|
||||
:privileges => 'ALL',
|
||||
)}
|
||||
end
|
||||
|
||||
|
@ -33,6 +33,7 @@ describe 'heat::db::postgresql' do
|
|||
context "on #{os}" do
|
||||
let (:facts) do
|
||||
facts.merge(OSDefaults.get_facts({
|
||||
:os_workers => 8,
|
||||
:concat_basedir => '/var/lib/puppet/concat'
|
||||
}))
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue