From: Mathieu Gagné <mgagne@iweb.com>
Date: Thu, 11 Apr 2013 18:50:54 +0000 (-0400)
Subject: Remove rabbit_host/rabbit_port config when rabbit_hosts is provided
X-Git-Tag: grizzly-eol~15^2~9^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4c0368917412fcc740cdb1b560a3bd8e440a8ff7;p=puppet-modules%2Fpuppet-ceilometer.git

Remove rabbit_host/rabbit_port config when rabbit_hosts is provided
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 59e9c33..a9aa5c8 100644
--- 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 5929b12..f006878 100644
--- 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