[openstack-neutron] Updated patches from master-patches

[Terry Wilson]

commit 2d2e93b5ff6d2ec4e4f638916597e9158763ea8d
Author: Terry Wilson <twilson at redhat.com>
Date:   Wed Dec 4 16:38:35 2013 -0600

    Updated patches from master-patches

 ...Add-vpnaas-and-debug-filters-to-setup.cfg.patch |   31 ++++++++++++++++++++
 openstack-neutron.spec                             |    2 +
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/0001-Add-vpnaas-and-debug-filters-to-setup.cfg.patch b/0001-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
new file mode 100644
index 0000000..8852cda
--- /dev/null
+++ b/0001-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
@@ -0,0 +1,31 @@
+From d11b678aaa0926c90eef1ef1a7e6cf9279dcf022 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 010fde0..62ec7b3 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -36,6 +36,7 @@ Source30:	neutron-dist.conf
 #
 # patches_base=2013.2+1
 #
+Patch0001: 0001-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
 
 BuildArch:	noarch
 
@@ -391,6 +392,7 @@ IPSec.
 %prep
 %setup -q -n neutron-%{version}
 
+%patch0001 -p1
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
 chmod 644 neutron/plugins/cisco/README