X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2F0002-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch;fp=rpm%2FSOURCES%2F0002-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch;h=0000000000000000000000000000000000000000;hb=2dd62a121c7d2565bd357d59e1e598a825abb966;hp=bfb0bf74d152564951f17b16a70cc172d3d0d842;hpb=7858ae023acbcdc5aff394451b1bd694a2ed7fdb;p=openstack-build%2Fneutron-build.git

diff --git a/rpm/SOURCES/0002-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch b/rpm/SOURCES/0002-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch
deleted file mode 100644
index bfb0bf74d..000000000
--- a/rpm/SOURCES/0002-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0c1e1a1d753bb822d3783778f94878a9ef390dd2 Mon Sep 17 00:00:00 2001
-From: Chris Wright <chrisw@sous-sol.org>
-Date: Mon, 7 Jan 2013 18:21:20 -0800
-Subject: [PATCH] dhcp agent: make dnsmasq tags work with RHEL 6
-
-rhbz 887369
-
-RHEL 6 has dnsmasq-2.48 which has a different syntax for tags compared
-with newer (>= dnsmasq-2.53). This patch updates command line and
-options file contents to work with dnsmasq-2.48.
-
-Change-Id: Ibf9309007fbf62f1f176737f2a5d179eabcf89dc
-Signed-off-by: Chris Wright <chrisw@redhat.com>
----
- quantum/agent/linux/dhcp.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/quantum/agent/linux/dhcp.py b/quantum/agent/linux/dhcp.py
-index 709d7da..20752e3 100644
---- a/quantum/agent/linux/dhcp.py
-+++ b/quantum/agent/linux/dhcp.py
-@@ -273,7 +273,7 @@ class Dnsmasq(DhcpLocalProcess):
-                 # TODO (mark): how do we indicate other options
-                 # ra-only, slaac, ra-nameservers, and ra-stateless.
-                 mode = 'static'
--            cmd.append('--dhcp-range=set:%s,%s,%s,%ss' %
-+            cmd.append('--dhcp-range=%s,%s,%s,%ss' %
-                        (self._TAG_PREFIX % i,
-                         netaddr.IPNetwork(subnet.cidr).network,
-                         mode,
-@@ -404,7 +404,7 @@ class Dnsmasq(DhcpLocalProcess):
-                             'quantum-dhcp-agent-dnsmasq-lease-update')
- 
-     def _format_option(self, index, option_name, *args):
--        return ','.join(('tag:' + self._TAG_PREFIX % index,
-+        return ','.join((self._TAG_PREFIX % index,
-                          'option:%s' % option_name) + args)
- 
-     @classmethod