openstack
/
puppet-ceilometer
Code Issues Proposed changes

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

3
manifests/init.pp
View File

@ -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';
}

4
spec/classes/ceilometer_init_spec.rb
View File

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