Switch deprecated rabbit_notifier to rpc_notifier

The 'nova.openstack.common.notifier.rabbit_notifier' is deprecated since
the G release of Openstack, it has to be replaced with
'nova.openstack.common.notifier.rpc_notifier'.

Change-Id: I2174bc1b6504bacfeb427b2f5b8f8dc19c167dcb

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index c9ed60dbcaf6cb33c85bbe919b5e749baacf5d39..6f5fea06388294a7e461bb58bb1b58a0cf54d39d 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -101,7 +101,7 @@ class ceilometer::agent::compute (
   file_line {
     'nova-notification-driver-common':
       line   =>
-        'notification_driver=nova.openstack.common.notifier.rabbit_notifier',
+        'notification_driver=nova.openstack.common.notifier.rpc_notifier',
       path   => '/etc/nova/nova.conf',
       notify => Service['nova-compute'];
     'nova-notification-driver-ceilometer':

diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
index 34494692d6a4107c53ab12621ae3afcf4c178267..fdf2a54356d1aabc03e7444e2a091ac48b54ba0c 100644 (file)
--- a/spec/classes/ceilometer_agent_compute_spec.rb
+++ b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -67,7 +67,7 @@ describe 'ceilometer::agent::compute' do
 
     it 'configures nova notification driver' do
       should contain_file_line('nova-notification-driver-common').with(
-        :line   => 'notification_driver=nova.openstack.common.notifier.rabbit_notifier',
+        :line   => 'notification_driver=nova.openstack.common.notifier.rpc_notifier',
         :path   => '/etc/nova/nova.conf',
         :notify => 'Service[nova-compute]'
       )