Merge "Remove glance_notifications from notification_topic" into stab…

…le/havana
xbezdick · Feb 14, 2014 · 0a6d87c · 0a6d87c
2 parents 91045b3 + 6bc791f
commit 0a6d87c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -183,13 +183,9 @@
     '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
@@ -148,8 +148,8 @@
       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