diff -Nru neutron-2014.1.5/debian/changelog neutron-2014.1.5/debian/changelog
--- neutron-2014.1.5/debian/changelog	2015-06-24 23:04:10.000000000 +0800
+++ neutron-2014.1.5/debian/changelog	2015-12-18 13:06:43.000000000 +0800
@@ -1,3 +1,12 @@
+neutron (1:2014.1.5-0ubuntu2) UNRELEASED; urgency=medium
+
+  * neutron-openvswitch-agent stuck on 'q-agent-notifier-port-update_fanout-x'
+    is NOT_FOUND exception, this bug caused RabbitMQ HA(active + active) failover
+    in Icehouse not work with large scaled nova compute nodes. (LP: #1393391):
+    - d/p/fix-neutron-agent-fanout-queue-not-found-loop.patch 
+
+ -- Hui Xiang <hui.xiang@canonical.com>  Fri, 18 Dec 2015 13:05:32 +0800
+
 neutron (1:2014.1.5-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (877df58) (LP: #1467533):
diff -Nru neutron-2014.1.5/debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch neutron-2014.1.5/debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch
--- neutron-2014.1.5/debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	1970-01-01 08:00:00.000000000 +0800
+++ neutron-2014.1.5/debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	2015-12-18 13:04:59.000000000 +0800
@@ -0,0 +1,18 @@
+--- a/neutron/openstack/common/rpc/impl_kombu.py
++++ b/neutron/openstack/common/rpc/impl_kombu.py
+@@ -746,6 +746,15 @@
+                 self.consume()
+             except greenlet.GreenletExit:
+                 return
++            except Exception as e:
++                if e.code == 404:
++                    # redeclare queue if it is deleted due to HA cluster
++                    # disconnection, LP#1393391
++                    LOG.warn(_("Queue NOT FOUND : %s"), e)
++                    self.channel = self.connection.channel()
++                    for consumer in self.consumers:
++                        consumer.reconnect(self.channel)
++
+         if self.consumer_thread is None:
+             self.consumer_thread = eventlet.spawn(_consumer_thread)
+         return self.consumer_thread
diff -Nru neutron-2014.1.5/debian/patches/series neutron-2014.1.5/debian/patches/series
--- neutron-2014.1.5/debian/patches/series	2015-06-24 23:04:10.000000000 +0800
+++ neutron-2014.1.5/debian/patches/series	2015-12-18 13:04:42.000000000 +0800
@@ -2,3 +2,4 @@
 disable-udev-tests.patch
 skip-ipv6-tests.patch
 use-concurrency.patch
+fix-neutron-agent-fanout-queue-not-found-loop.patch