diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 93c2d9e7..3b045a9b 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -46,8 +46,15 @@ require => Class['mysql::config'], } - if $allowed_hosts { - ceilometer::db::mysql::host_access { $allowed_hosts: + # Check allowed_hosts to avoid duplicate resource declarations + if is_array($allowed_hosts) and delete($allowed_hosts,$host) != [] { + $real_allowed_hosts = delete($allowed_hosts,$host) + } elsif is_string($allowed_hosts) and ($allowed_hosts != $host) { + $real_allowed_hosts = $allowed_hosts + } + + if $real_allowed_hosts { + ceilometer::db::mysql::host_access { $real_allowed_hosts: user => $user, password => $password, database => $dbname, diff --git a/spec/classes/ceilometer_db_mysql_spec.rb b/spec/classes/ceilometer_db_mysql_spec.rb index f0c02b3b..04241986 100644 --- a/spec/classes/ceilometer_db_mysql_spec.rb +++ b/spec/classes/ceilometer_db_mysql_spec.rb @@ -48,4 +48,63 @@ it_configures 'ceilometer mysql database' end + + describe "overriding allowed_hosts param to array" do + let :facts do + { :osfamily => "Debian" } + end + let :params do + { + :password => 'ceilometerpass', + :allowed_hosts => ['localhost','%'] + } + end + + it {should_not contain_ceilometer__db__mysql__host_access("localhost").with( + :user => 'ceilometer', + :password => 'ceilometerpass', + :database => 'ceilometer' + )} + it {should contain_ceilometer__db__mysql__host_access("%").with( + :user => 'ceilometer', + :password => 'ceilometerpass', + :database => 'ceilometer' + )} + end + + describe "overriding allowed_hosts param to string" do + let :facts do + { :osfamily => 'RedHat' } + end + let :params do + { + :password => 'ceilometerpass2', + :allowed_hosts => '192.168.1.1' + } + end + + it {should contain_ceilometer__db__mysql__host_access("192.168.1.1").with( + :user => 'ceilometer', + :password => 'ceilometerpass2', + :database => 'ceilometer' + )} + end + + describe "overriding allowed_hosts param equals to host param " do + let :facts do + { :osfamily => 'RedHat' } + end + let :params do + { + :password => 'ceilometerpass2', + :allowed_hosts => 'localhost' + } + end + + it {should_not contain_ceilometer__db__mysql__host_access("localhost").with( + :user => 'ceilometer', + :password => 'ceilometerpass2', + :database => 'ceilometer' + )} + end end