From 85d46894cca6ba80e8cb57243dde57e44cffa443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Tue, 28 Jan 2014 18:18:00 -0500 Subject: [PATCH] Do not enforce glance_control_exchange The default glance_control_exchange in Ceilometer has been changed from 'glance_notifications' to 'glance' in grizzly-2. Glance always had 'glance' for its control_exchange. This was a bug in Ceilometer and puppet-ceilometer patched it. It shouldn't anymore. Change-Id: I217515c91f092fb3e8039dde2d14a7ab4cbb7245 Closes-bug: #1273878 --- manifests/init.pp | 3 --- spec/classes/ceilometer_init_spec.rb | 4 ---- 2 files changed, 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 24933860..3b46496f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -182,9 +182,6 @@ class ceilometer( 'DEFAULT/debug' : value => $debug; 'DEFAULT/log_dir' : value => $log_dir; 'DEFAULT/verbose' : value => $verbose; - # Fix a bad default value in ceilometer. - # Fixed in https://review.openstack.org/#/c/18487/ - 'DEFAULT/glance_control_exchange': value => 'glance'; 'DEFAULT/notification_topics' : value => 'notifications'; } diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index b3d11131..0e84aaa7 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -144,10 +144,6 @@ describe 'ceilometer' do it { should contain_ceilometer_config('DEFAULT/syslog_log_facility').with_value('LOG_LOCAL0') } end - it 'fixes a bad value in ceilometer (glance_control_exchange)' do - should contain_ceilometer_config('DEFAULT/glance_control_exchange').with_value('glance') - end - it 'configures notification_topics' do should contain_ceilometer_config('DEFAULT/notification_topics').with_value('notifications') end