[openstack-neutron] Disable nova notifications by default

[Ihar Hrachyshka]

commit aca8823ebccbef31cc1b4d8b5525a761e6cd9915
Author: Jakub Libosvar <libosvar at redhat.com>
Date:   Wed Jun 11 13:46:01 2014 +0200

    Disable nova notifications by default
    
    Because of nova notifications feature is new in RHOS 5.0 we need to disable it
    to keep upgraded environments from RHOS 4.0 working. The notifications are
    enabled and configured in puppet modules.
    
    Resolves rhbz: 1094506
    
    Change-Id: Ia2e0af359c8a58059efffcd19d0b99fefd8ab7bb
    (cherry picked from commit cb937956c9bcc703ca00f0c916daa9b1b56b1237)

 neutron-dist.conf      |    2 ++
 openstack-neutron.spec |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/neutron-dist.conf b/neutron-dist.conf
index 17882ac..b82d977 100644
--- a/neutron-dist.conf
+++ b/neutron-dist.conf
@@ -6,6 +6,8 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
 allow_overlapping_ips = True
 use_stderr = False
 api_paste_config = /usr/share/neutron/api-paste.ini
+notify_nova_on_port_data_changes = False
+notify_nova_on_port_status_changes = False
 
 [quotas]
 
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 1570d65..463c5ea 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -1028,6 +1028,9 @@ fi
 
 
 %changelog
+* Wed Jun 11 2014 Jakub Libosvar <jlibosva at redhat.com> 2014.1.1-5
+- Disable nova notifications by default, bz#1093879
+
 * Wed Jun 25 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.1-4
 - remove token from notifier middleware, bz#1112948