Remove glance_notifications from notification_topic

The default notification_topic in Glance has been changed from
'glance_notifications' to 'notifications' in grizzly-2.

Ceilometer was configured to also listen on the
'glance_notifications' notification_topic in addition to
'notifications' to patch this bug. It shouldn't anymore.

Change-Id: I3d797c7e849319a1e20ef3ecbf158e8b8579d450
Closes-bug: #1273876

diff --git a/manifests/init.pp b/manifests/init.pp
index 5488144dad7e7d9cd821f1ff058fc731e9eb7eed..2493386085c6555a7e42dcb9ebec87ec7b4e35a5 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -183,13 +183,9 @@ class ceilometer(
     '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/
+    # Fixed in https://review.openstack.org/#/c/18487/
     'DEFAULT/glance_control_exchange': value => 'glance';
-    # Add glance-notifications topic.
-    # Fixed in glance https://github.com/openstack/glance/commit/2e0734e077ae
-    # Fix will be included in Grizzly
-    'DEFAULT/notification_topics'    :
-      value => 'notifications,glance_notifications';
+    'DEFAULT/notification_topics'    : value => 'notifications';
   }
 
   # Syslog configuration

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 2db479400f3b186b8e6568accad5dc78ee533d06..b3d1113114bf9a46578eb53ba8d2ee7783568765 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -148,8 +148,8 @@ describe 'ceilometer' do
       should contain_ceilometer_config('DEFAULT/glance_control_exchange').with_value('glance')
     end
 
-    it 'adds glance-notifications topic' do
-      should contain_ceilometer_config('DEFAULT/notification_topics').with_value('notifications,glance_notifications')
+    it 'configures notification_topics' do
+      should contain_ceilometer_config('DEFAULT/notification_topics').with_value('notifications')
     end
   end