[openstack-neutron] Updated patches from master-patches

[Terry Wilson]

commit 8a35c16e88050555cb2d2be822373df40d5df04c
Author: Terry Wilson <twilson at redhat.com>
Date:   Thu Dec 12 16:30:23 2013 -0600

    Updated patches from master-patches

 0002-Add-fwaas_driver.ini-to-setup.cfg.patch |   24 +++++++
 0003-Sync-rpc-fix-from-oslo-incubator.patch  |   91 ++++++++++++++++++++++++++
 openstack-neutron.spec                       |    4 +
 3 files changed, 119 insertions(+), 0 deletions(-)
---
diff --git a/0002-Add-fwaas_driver.ini-to-setup.cfg.patch b/0002-Add-fwaas_driver.ini-to-setup.cfg.patch
new file mode 100644
index 0000000..db8016d
--- /dev/null
+++ b/0002-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -0,0 +1,24 @@
+From 8073dd8a443ce51b17ee00c7ae14c1adb5b19d54 Mon Sep 17 00:00:00 2001
+From: Terry Wilson <twilson at redhat.com>
+Date: Fri, 6 Dec 2013 11:13:09 -0600
+Subject: [PATCH] Add fwaas_driver.ini to setup.cfg
+
+Change-Id: Ie8157c0df343fb1009e7bc5b3ed2f2d4b0d0afec
+Closes-Bug: 1258585
+(cherry picked from commit daf0d68f9fc1f878ae29061dc43c19fd3e4950ef)
+---
+ setup.cfg | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.cfg b/setup.cfg
+index de9034f..2c44e8c 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -26,6 +26,7 @@ data_files =
+ 	etc/neutron =
+ 	etc/api-paste.ini
+ 	etc/dhcp_agent.ini
++	etc/fwaas_driver.ini
+ 	etc/l3_agent.ini
+ 	etc/lbaas_agent.ini
+ 	etc/metadata_agent.ini
diff --git a/0003-Sync-rpc-fix-from-oslo-incubator.patch b/0003-Sync-rpc-fix-from-oslo-incubator.patch
new file mode 100644
index 0000000..12e0a87
--- /dev/null
+++ b/0003-Sync-rpc-fix-from-oslo-incubator.patch
@@ -0,0 +1,91 @@
+From 9ff5cbef1055b5f6d05863ab4701042115aec363 Mon Sep 17 00:00:00 2001
+From: Flavio Percoco <flaper87 at gmail.com>
+Date: Fri, 6 Dec 2013 15:35:14 +0100
+Subject: [PATCH] Sync rpc fix from oslo-incubator
+
+Sync the following fixes from oslo-incubator:
+
+e227c0e Properly reconnect subscribing clients when QPID broker restarts
+ef406a2 Create a shared queue for QPID topic consumers
+
+Closes-bug: #1251757
+Closes-bug: #1257293
+Change-Id: I286edf6bc4a677aa61f60da785802c19878c79c7
+(cherry picked from commit 9f9792972ff81f244931d830194aae979604ffa0)
+---
+ neutron/openstack/common/rpc/impl_qpid.py | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py
+index 026d392..67e0f9c 100644
+--- a/neutron/openstack/common/rpc/impl_qpid.py
++++ b/neutron/openstack/common/rpc/impl_qpid.py
+@@ -18,7 +18,6 @@
+ import functools
+ import itertools
+ import time
+-import uuid
+ 
+ import eventlet
+ import greenlet
+@@ -123,7 +122,6 @@ class ConsumerBase(object):
+                     },
+                 },
+                 "link": {
+-                    "name": link_name,
+                     "durable": True,
+                     "x-declare": {
+                         "durable": False,
+@@ -138,6 +136,7 @@ class ConsumerBase(object):
+                 "link": {
+                     "x-declare": {
+                         "auto-delete": True,
++                        "exclusive": False,
+                     },
+                 },
+             }
+@@ -145,6 +144,8 @@ class ConsumerBase(object):
+             raise_invalid_topology_version()
+ 
+         addr_opts["link"]["x-declare"].update(link_opts)
++        if link_name:
++            addr_opts["link"]["name"] = link_name
+ 
+         self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
+ 
+@@ -208,14 +209,16 @@ class DirectConsumer(ConsumerBase):
+         if conf.qpid_topology_version == 1:
+             node_name = "%s/%s" % (msg_id, msg_id)
+             node_opts = {"type": "direct"}
++            link_name = msg_id
+         elif conf.qpid_topology_version == 2:
+             node_name = "amq.direct/%s" % msg_id
+             node_opts = {}
++            link_name = None
+         else:
+             raise_invalid_topology_version()
+ 
+         super(DirectConsumer, self).__init__(conf, session, callback,
+-                                             node_name, node_opts, msg_id,
++                                             node_name, node_opts, link_name,
+                                              link_opts)
+ 
+ 
+@@ -266,16 +269,14 @@ class FanoutConsumer(ConsumerBase):
+         if conf.qpid_topology_version == 1:
+             node_name = "%s_fanout" % topic
+             node_opts = {"durable": False, "type": "fanout"}
+-            link_name = "%s_fanout_%s" % (topic, uuid.uuid4().hex)
+         elif conf.qpid_topology_version == 2:
+             node_name = "amq.topic/fanout/%s" % topic
+             node_opts = {}
+-            link_name = ""
+         else:
+             raise_invalid_topology_version()
+ 
+         super(FanoutConsumer, self).__init__(conf, session, callback,
+-                                             node_name, node_opts, link_name,
++                                             node_name, node_opts, None,
+                                              link_opts)
+ 
+ 
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index f3622e3..2925c0a 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -37,6 +37,8 @@ Source30:	neutron-dist.conf
 # patches_base=2013.2+1
 #
 Patch0001: 0001-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
+Patch0002: 0002-Add-fwaas_driver.ini-to-setup.cfg.patch
+Patch0003: 0003-Sync-rpc-fix-from-oslo-incubator.patch
 
 BuildArch:	noarch
 
@@ -393,6 +395,8 @@ IPSec.
 %setup -q -n neutron-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
 chmod 644 neutron/plugins/cisco/README