[openstack-neutron/el6-icehouse] Disable nova notifications by default

[Ihar Hrachyshka]

commit 7c76343f43bd20fd6ad0d9524e5f8706fba23254
Author: Jakub Libosvar <libosvar at redhat.com>
Date:   Wed Jun 11 13:28:43 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: I9c8ba382a0ca69c48532a62b91ff250aba11d650
    (cherry picked from commit e18deeab2fc171d0a3843f1476c24295151052d6)

 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 9037812..b4ad00b 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -1103,6 +1103,9 @@ fi
 
 
 %changelog
+* Wed Jun 11 2014 Jakub Libosvar <jlibosva at redhat.com> - 2014.1.1-3
+- Disable nova notifications by default, bz#1093879
+
 * Wed Jun 25 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.1-2
 - remove token from notifier middleware, bz#1112948