Remove already applied patches

Fix RPM spec
Change-Id: Idd3dbc2a86035faa3a74f334fd1b67ad8f6dbdb5

diff --git a/debian/patches/series b/debian/patches/series
index 1e91a8c700390c1537eb912fe0306bf047df5009..aa0010058f494fb0797e47e3f43505d007e0f803 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ disable-udev-tests.patch
 bump-sqlalchemy-version.patch
 disable-ml2-notification-tests.patch
 remove-jsonrpclib.patch
-MIRA001-Send-DHCP-notifications-regardless-of-agent-status.patch

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 4d7728905b65fe7db540ac26ca4e6f114c33d6e5..82f8097582849f5c2c6951f8af1d8be07b390ad4 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -422,7 +422,7 @@ IPSec.
 %setup -q -n neutron-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
+#%patch0002 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -800,6 +800,7 @@ fi
 %attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/api-paste.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini