e7657de5ba
In the origin cinder::db::mysql, if the value of $allowed_hosts contains or equals to $host, then puppet will complain duplicate declaration error. This patch is aim to update the allowed_hosts conditonal statement in cinder::db::mysql. There are two cases to pass $allowed_hosts to $real_allowed_hosts: - If $allowed_hosts is array,then remove $host from $allowed_hosts; - elsif $allowed_hosts is string and not equivalent to $host; At last, if $real_allowed_hosts is not undef, then run cinder::db::mysql::host_access Fix bug 1206444 Change-Id: I7eb9d883c1617d9913899f32ef47a892c1d9a1a2
77 lines
1.7 KiB
Ruby
77 lines
1.7 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'cinder::db::mysql' do
|
|
|
|
let :req_params do
|
|
{:password => 'pw'}
|
|
end
|
|
|
|
let :facts do
|
|
{:osfamily => 'Debian'}
|
|
end
|
|
|
|
let :pre_condition do
|
|
'include mysql::server'
|
|
end
|
|
|
|
describe 'with only required params' do
|
|
let :params do
|
|
req_params
|
|
end
|
|
it { should contain_mysql__db('cinder').with(
|
|
:user => 'cinder',
|
|
:password => 'pw',
|
|
:host => '127.0.0.1',
|
|
:charset => 'latin1'
|
|
) }
|
|
end
|
|
describe "overriding allowed_hosts param to array" do
|
|
let :params do
|
|
{
|
|
:password => 'cinderpass',
|
|
:allowed_hosts => ['127.0.0.1','%']
|
|
}
|
|
end
|
|
|
|
it {should_not contain_cinder__db__mysql__host_access("127.0.0.1").with(
|
|
:user => 'cinder',
|
|
:password => 'cinderpass',
|
|
:database => 'cinder'
|
|
)}
|
|
it {should contain_cinder__db__mysql__host_access("%").with(
|
|
:user => 'cinder',
|
|
:password => 'cinderpass',
|
|
:database => 'cinder'
|
|
)}
|
|
end
|
|
describe "overriding allowed_hosts param to string" do
|
|
let :params do
|
|
{
|
|
:password => 'cinderpass2',
|
|
:allowed_hosts => '192.168.1.1'
|
|
}
|
|
end
|
|
|
|
it {should contain_cinder__db__mysql__host_access("192.168.1.1").with(
|
|
:user => 'cinder',
|
|
:password => 'cinderpass2',
|
|
:database => 'cinder'
|
|
)}
|
|
end
|
|
|
|
describe "overriding allowed_hosts param equals to host param " do
|
|
let :params do
|
|
{
|
|
:password => 'cinderpass2',
|
|
:allowed_hosts => '127.0.0.1'
|
|
}
|
|
end
|
|
|
|
it {should_not contain_cinder__db__mysql__host_access("127.0.0.1").with(
|
|
:user => 'cinder',
|
|
:password => 'cinderpass2',
|
|
:database => 'cinder'
|
|
)}
|
|
end
|
|
end
|