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

[Terry Wilson]

commit dab3cd2a42c60d4633e0215e65f6d04780d85902
Author: Terry Wilson <twilson at redhat.com>
Date:   Mon Dec 9 11:24:10 2013 -0600

    Updated patches from el6-havana-patches

 0003-Add-fwaas_driver.ini-to-setup.cfg.patch |   24 ++++++++++++++++++++++++
 openstack-neutron.spec                       |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/0003-Add-fwaas_driver.ini-to-setup.cfg.patch b/0003-Add-fwaas_driver.ini-to-setup.cfg.patch
new file mode 100644
index 0000000..1cb8554
--- /dev/null
+++ b/0003-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -0,0 +1,24 @@
+From 9bef02706e4b252f77bbf1d683269dbf118d9bad 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/openstack-neutron.spec b/openstack-neutron.spec
index 43977bd..e2a8013 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -56,6 +56,7 @@ Source90:	neutron-dist.conf
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Add-vpnaas-and-debug-filters-to-setup.cfg.patch
+Patch0003: 0003-Add-fwaas_driver.ini-to-setup.cfg.patch
 
 BuildArch:	noarch
 
@@ -423,6 +424,7 @@ IPSec.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +