openstack
/
puppet-glance
Code Issues Proposed changes

Update allowed_hosts conditional statement 

In the origin glance::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 glance::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
glance::db::mysql::host_access

Fix bug 1206444

Change-Id: Ic70aaaec493195c7277782abb87469f9809e5baa
This commit is contained in:
Xingchao Yu 2013-07-30 19:04:34 +08:00
parent 67790ef1d4
commit aee08d0cbb
2 changed files with 70 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/db/mysql.pp
View File

@ -25,9 +25,18 @@ class glance::db::mysql(
require => Class['mysql::config'],
}
if $allowed_hosts {
# Check allowed_hosts to avoid duplicate resource declarations
# If $host in $allowed_hosts, then remove it
if is_array($allowed_hosts) and delete($allowed_hosts,$host) != [] {
$real_allowed_hosts = delete($allowed_hosts,$host)
# If $host = $allowed_hosts, then set it to undef
} elsif is_string($allowed_hosts) and ($allowed_hosts != $host) {
$real_allowed_hosts = $allowed_hosts
}
if $real_allowed_hosts {
# TODO this class should be in the mysql namespace
glance::db::mysql::host_access { $allowed_hosts:
glance::db::mysql::host_access { $real_allowed_hosts:
user => $user,
password => $password,
database => $dbname,

64
spec/classes/glance_db_mysql_spec.rb
View File

@ -14,11 +14,11 @@ describe 'glance::db::mysql' do
describe "with default params" do
let :params do
{
:password => 'glancepass1'
:password => 'glancepass1'
}
end
it { should include_class('mysql::python') }
it { should include_class('mysql::python') }
it { should contain_mysql__db('glance').with(
:password => 'glancepass1',
@ -31,9 +31,9 @@ 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
@ -44,4 +44,58 @@ describe 'glance::db::mysql' do
end
describe "overriding allowed_hosts param to array" do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => ['127.0.0.1','%']
}
end
it {should_not contain_glance__db__mysql__host_access("127.0.0.1").with(
:user => 'glance',
:password => 'glancepass2',
:database => 'glancedb2'
)}
it {should contain_glance__db__mysql__host_access("%").with(
:user => 'glance',
:password => 'glancepass2',
:database => 'glancedb2'
)}
end
describe "overriding allowed_hosts param to string" do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '192.168.1.1'
}
end
it {should contain_glance__db__mysql__host_access("192.168.1.1").with(
:user => 'glance',
:password => 'glancepass2',
:database => 'glancedb2'
)}
end
describe "overriding allowed_hosts param equals to host param " do
let :params do
{
:password => 'glancepass2',
:dbname => 'glancedb2',
:allowed_hosts => '127.0.0.1'
}
end
it {should_not contain_glance__db__mysql__host_access("127.0.0.1").with(
:user => 'glance',
:password => 'glancepass2',
:database => 'glancedb2'
)}
end
end