[openstack-quantum/el6-grizzly] Updated patches from el6-grizzly-patches

[Terry Wilson]

commit bb7f23725fa811f978134a0547738f0ddabcf747
Author: Terry Wilson <twilson at redhat.com>
Date:   Tue Apr 23 13:12:53 2013 -0500

    Updated patches from el6-grizzly-patches

 0001-Treat-invalid-namespace-call.patch            |   26 -------------
 ...-agent-make-dnsmasq-tags-work-with-RHEL-6.patch |   39 ++++++++++++++++++++
 openstack-quantum.spec                             |    2 +
 3 files changed, 41 insertions(+), 26 deletions(-)
---
diff --git a/0001-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch b/0001-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch
new file mode 100644
index 0000000..55c12dc
--- /dev/null
+++ b/0001-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch
@@ -0,0 +1,39 @@
+From 6ce9b55f1319831ca3a711c03cffb6cda5218fe8 Mon Sep 17 00:00:00 2001
+From: Chris Wright <chrisw at 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 at redhat.com>
+---
+ quantum/agent/linux/dhcp.py | 4 ++--
+ 1 file 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
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index 3b7a594..c899e54 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -44,6 +44,7 @@ Source29:	quantum-lbaas-agent.upstart
 #
 # patches_base=2013.1
 #
+Patch0001: 0001-dhcp-agent-make-dnsmasq-tags-work-with-RHEL-6.patch
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-quantum-newdeps.patch
@@ -305,6 +306,7 @@ networks using multiple other quantum plugins.
 %prep
 %setup -q -n quantum-%{version}
 
+%patch0001 -p1
 # Apply EPEL patch
 %patch100 -p1