From: Sergey Kolekonov Date: Thu, 16 Apr 2015 11:16:04 +0000 (+0300) Subject: Do not set notification_driver by default X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fopenstack-ci%2Ffuel-6.0.1%2F2014.2;p=openstack-build%2Fneutron-build.git Do not set notification_driver by default Neutron doesn't require notification_driver parameter by default. This parameter is set by Puppet during deployment if Ceilometer is enabled, otherwise it's set twice and causes duplicated messages in RabbitMQ's queue Change-Id: Ia6aa7376c6c9f8d8ce41b3635a477267f5dbeef5 Closes-bug: #1443772 Closes-bug: #1434572 (cherry picked from commit 980fa2d150d6a3a004788ef30592d6f14de55d22) --- diff --git a/rpm/SOURCES/neutron-dist.conf b/rpm/SOURCES/neutron-dist.conf index 17882aca8..ff1cd73e1 100644 --- a/rpm/SOURCES/neutron-dist.conf +++ b/rpm/SOURCES/neutron-dist.conf @@ -2,7 +2,6 @@ verbose = True lock_path = $state_path/lock auth_strategy = noauth -notification_driver = neutron.openstack.common.notifier.rpc_notifier allow_overlapping_ips = True use_stderr = False api_paste_config = /usr/share/neutron/api-paste.ini