[openstack-neutron/el6-havana] Updated patches from el6-havana-patches

[Terry Wilson]

commit 2c40d5c35af3c788efb0a9f99d41638072bc07fe
Author: Terry Wilson <twilson at redhat.com>
Date:   Wed Dec 4 17:25:07 2013 -0600

    Updated patches from el6-havana-patches

 ...-use-parallel-installed-versions-in-RHEL6.patch |    6 ++--
 ...Add-vpnaas-and-debug-filters-to-setup.cfg.patch |   31 ++++++++++++++++++++
 openstack-neutron.spec                             |    2 +
 3 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index 393bea9..0d2dbd4 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -1,4 +1,4 @@
-From eab7e0fd0c6c57f445ab75fa154d9eb482a80aa2 Mon Sep 17 00:00:00 2001
+From 9e51bf76149105791742f84a4a639f9a0f661aad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Fri, 13 Apr 2012 17:24:40 +0100
 Subject: [PATCH] use parallel installed versions in RHEL6
@@ -7,8 +7,8 @@ of webob sqlalchemy python-routes paste-deploy python-jinja2-26
 
 Change-Id: I290f56eae61c87893639a9e5d29f7fff760452cf
 ---
- neutron/__init__.py |   31 +++++++++++++++++++++++++++++++
- 1 files changed, 31 insertions(+), 0 deletions(-)
+ neutron/__init__.py | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
 
 diff --git a/neutron/__init__.py b/neutron/__init__.py
 index b2c81bd..fef4d32 100644
diff --git a/0002-Add-vpnaas-and-debug-filters-to-setup.cfg.patch b/0002-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
new file mode 100644
index 0000000..690dc7c
--- /dev/null
+++ b/0002-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
@@ -0,0 +1,31 @@
+From 07a7c5e7fbb62a719fe46b52e51ecc5eefc018d3 Mon Sep 17 00:00:00 2001
+From: Terry Wilson <twilson at redhat.com>
+Date: Wed, 4 Dec 2013 16:36:30 -0600
+Subject: [PATCH] Add vpnaas and debug filters to setup.cfg
+
+Change-Id: I44f7e4a44276a386b6e4d8bfb8370eb103787a21
+Closes-Bug: 1257523
+---
+ setup.cfg | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/setup.cfg b/setup.cfg
+index 59cc67a..de9034f 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -35,6 +35,7 @@ data_files =
+ 	etc/rootwrap.conf
+ 	etc/vpn_agent.ini
+ 	etc/neutron/rootwrap.d =
++	etc/neutron/rootwrap.d/debug.filters
+ 	etc/neutron/rootwrap.d/dhcp.filters
+ 	etc/neutron/rootwrap.d/iptables-firewall.filters
+ 	etc/neutron/rootwrap.d/l3.filters
+@@ -43,6 +44,7 @@ data_files =
+ 	etc/neutron/rootwrap.d/nec-plugin.filters
+ 	etc/neutron/rootwrap.d/openvswitch-plugin.filters
+ 	etc/neutron/rootwrap.d/ryu-plugin.filters
++	etc/neutron/rootwrap.d/vpnaas.filters
+ 	etc/init.d = etc/init.d/neutron-server
+ 	etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini
+ 	etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 6c9b200..b352669 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -55,6 +55,7 @@ Source90:	neutron-dist.conf
 # patches_base=2013.2+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
+Patch0002: 0002-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
 
 BuildArch:	noarch
 
@@ -421,6 +422,7 @@ IPSec.
 %setup -q -n neutron-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +