Update default notification_driver for ceilometer

This change updates the default notification_driver for the
cinder::ceilometer class to use the oslo.messaing method that was added
as part of icehouse/juno.

Change-Id: I99c3d54c64caefb4f2aa3c56c118bd2607a0ba96
Closes-Bug: 1476378
This commit is contained in:
Alex Schultz 2015-07-20 15:18:39 -05:00
parent 978e33b024
commit b5649e7e55
2 changed files with 8 additions and 7 deletions

View File

@ -7,16 +7,17 @@
#
# [*notification_driver*]
# (option) Driver or drivers to handle sending notifications.
# Notice: rabbit_notifier has been deprecated in Grizzly, use rpc_notifier instead.
# The default value of 'messagingv2' is for enabling notifications via
# oslo.messaging. 'cinder.openstack.common.notifier.rpc_notifier' is the
# backwards compatible option that will be deprecated. Prior to Grizzly,
# 'cinder.openstack.common.notifier.rabbit_notifier' was used. oslo.messaging
# was adopted in icehouse/juno. See LP#1425713.
#
class cinder::ceilometer (
$notification_driver = 'cinder.openstack.common.notifier.rpc_notifier'
$notification_driver = 'messagingv2',
) {
cinder_config {
'DEFAULT/notification_driver': value => $notification_driver;
'DEFAULT/notification_driver': value => $notification_driver;
}
}

View File

@ -5,7 +5,7 @@ describe 'cinder::ceilometer' do
describe 'with default parameters' do
it 'contains default values' do
is_expected.to contain_cinder_config('DEFAULT/notification_driver').with(
:value => 'cinder.openstack.common.notifier.rpc_notifier')
:value => 'messagingv2')
end
end
end