From bc6873041c5952910cf3522c9ce4fecb22278d25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Charlier?= Date: Thu, 6 Jun 2013 12:23:53 +0200 Subject: [PATCH] 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 --- manifests/agent/compute.pp | 2 +- spec/classes/ceilometer_agent_compute_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp index c9ed60d..6f5fea0 100644 --- 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 3449469..fdf2a54 100644 --- 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]' ) -- 2.45.2