openstack
/
puppet-ceilometer
Code Issues Proposed changes

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
This commit is contained in:
Mathieu Gagné 2014-01-28 18:13:01 -05:00
parent 3685997f0e
commit 924f18ffae
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -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

4
spec/classes/ceilometer_init_spec.rb
View File

@ -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