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 (cherry picked from commit 85d4689)
xbezdick · Feb 28, 2014 · fa5a6ee · fa5a6ee
1 parent 9510508
commit fa5a6ee
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -180,9 +180,6 @@
     'DEFAULT/metering_secret'        : value => $metering_secret;
     'DEFAULT/debug'                  : value => $debug;
     '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
@@ -153,10 +153,6 @@
       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