diff -Nru oslo.messaging-1.4.1/debian/changelog oslo.messaging-1.4.1/debian/changelog
--- oslo.messaging-1.4.1/debian/changelog	2015-09-17 19:55:37.000000000 +0800
+++ oslo.messaging-1.4.1/debian/changelog	2015-12-17 16:12:37.000000000 +0800
@@ -1,3 +1,11 @@
+oslo.messaging (1.4.1-0ubuntu1.2~cloud0ubuntu1) trusty-juno; urgency=medium
+
+  * Backport of upstream release. (LP: #1318721): 
+    - d/p/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch:
+      Redeclare if exception is catched after self.queue.declare() failed.
+
+ -- Hui Xiang <hui.xiang@canonical.com>  Thu, 17 Dec 2015 16:09:57 +0800
+
 oslo.messaging (1.4.1-0ubuntu1.2~cloud0) trusty-juno; urgency=medium
 
   * Backport of upstream fix for LP: #1338732.
diff -Nru oslo.messaging-1.4.1/debian/patches/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch oslo.messaging-1.4.1/debian/patches/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch
--- oslo.messaging-1.4.1/debian/patches/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch	1970-01-01 08:00:00.000000000 +0800
+++ oslo.messaging-1.4.1/debian/patches/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch	2015-12-17 16:06:21.000000000 +0800
@@ -0,0 +1,24 @@
+--- a/oslo/messaging/_drivers/impl_rabbit.py
++++ b/oslo/messaging/_drivers/impl_rabbit.py
+@@ -159,7 +159,20 @@
+         self.channel = channel
+         self.kwargs['channel'] = channel
+         self.queue = kombu.entity.Queue(**self.kwargs)
+-        self.queue.declare()
++        try:
++            self.queue.declare()
++        except Exception as e:
++            # NOTE: This exception may be triggered by a race condition.
++            # Simply retrying will solve the error most of the time and
++            # should work well enough as a workaround until the race condition
++            # itself can be fixed.
++            # TODO(jrosenboom): In order to be able to match the Execption
++            # more specifically, we have to refactor ConsumerBase to use
++            # 'channel_errors' of the kombu connection object that
++            # has created the channel.
++            # See https://bugs.launchpad.net/neutron/+bug/1318721 for details.
++            LOG.exception(_("Declaring queue failed with (%s), retrying"), e)
++            self.queue.declare()
+ 
+     def _callback_handler(self, message, callback):
+         """Call callback with deserialized message.
diff -Nru oslo.messaging-1.4.1/debian/patches/series oslo.messaging-1.4.1/debian/patches/series
--- oslo.messaging-1.4.1/debian/patches/series	2015-09-17 19:55:06.000000000 +0800
+++ oslo.messaging-1.4.1/debian/patches/series	2015-12-17 16:07:40.000000000 +0800
@@ -5,3 +5,4 @@
 0004-rabbit-redeclare-consumers-when-ack-requeue-fail.patch
 0005-Fix-possible-usage-of-undefined-variable.patch
 0006-Declare-DirectPublisher-exchanges-with-passive-True.patch
+0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch