Remove rabbit_host/rabbit_port config when rabbit_hosts is provided

diff --git a/manifests/init.pp b/manifests/init.pp
index 59e9c33955b1ae0ac242e44ae745727365caebe6..a9aa5c8c3cf5d45f1e838dcc931ca6901f92a398 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -52,6 +52,8 @@ class ceilometer (
   Package['ceilometer-common'] -> Ceilometer_config<||>
 
   if $rabbit_hosts {
+    ceilometer_config { 'DEFAULT/rabbit_host': ensure => absent }
+    ceilometer_config { 'DEFAULT/rabbit_port': ensure => absent }
     ceilometer_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') }
   } else {
     ceilometer_config { 'DEFAULT/rabbit_host': value => $rabbit_host }

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 5929b12cf3652d2c24dac8a8409b269d3bdd31b2..f006878c644bb95eac74eaa3cf5705e1ddedc3d6 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -121,15 +121,15 @@ describe 'ceilometer' do
   end
 
   shared_examples_for 'rabbit without HA support (without backward compatibility)' do
-    it { should_not contain_ceilometer_config('DEFAULT/rabbit_host') }
-    it { should_not contain_ceilometer_config('DEFAULT/rabbit_port') }
+    it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') }
+    it { should contain_ceilometer_config('DEFAULT/rabbit_port').with_ensure('absent') }
     it { should contain_ceilometer_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) }
     it { should contain_ceilometer_config('DEFAULT/rabbit_ha_queues').with_value('false') }
   end
 
   shared_examples_for 'rabbit with HA support' do
-    it { should_not contain_ceilometer_config('DEFAULT/rabbit_host') }
-    it { should_not contain_ceilometer_config('DEFAULT/rabbit_port') }
+    it { should contain_ceilometer_config('DEFAULT/rabbit_host').with_ensure('absent') }
+    it { should contain_ceilometer_config('DEFAULT/rabbit_port').with_ensure('absent') }
     it { should contain_ceilometer_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) }
     it { should contain_ceilometer_config('DEFAULT/rabbit_ha_queues').with_value('true') }
   end