From 4c0368917412fcc740cdb1b560a3bd8e440a8ff7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20Gagne=CC=81?= Date: Thu, 11 Apr 2013 14:50:54 -0400 Subject: [PATCH] Remove rabbit_host/rabbit_port config when rabbit_hosts is provided --- manifests/init.pp | 2 ++ spec/classes/ceilometer_init_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) 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 -- 2.45.2