Update specs to v. 2014.1.b3

[openstack-build/neutron-build.git] / rpm / SOURCES / 0002-Remove-dnsmasq-version-warning.patch

diff --git a/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch b/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch
new file mode 100644 (file)
index 0000000..406daca
--- /dev/null
+++ b/rpm/SOURCES/0002-Remove-dnsmasq-version-warning.patch
@@ -0,0 +1,31 @@
+From 85a3b3a1ae3886db3b803db317974e33beaef6a2 Mon Sep 17 00:00:00 2001
+From: Terry Wilson <twilson@redhat.com>
+Date: Fri, 13 Dec 2013 09:41:43 -0600
+Subject: [PATCH] Remove dnsmasq version warning
+
+---
+ neutron/agent/linux/dhcp.py |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
+index 137f7a9..7406597 100644
+--- a/neutron/agent/linux/dhcp.py
++++ b/neutron/agent/linux/dhcp.py
+@@ -291,10 +291,13 @@ class Dnsmasq(DhcpLocalProcess):
+             ver = re.findall("\d+.\d+", out)[0]
+             is_valid_version = float(ver) >= cls.MINIMUM_VERSION
+             if not is_valid_version:
+-                LOG.warning(_('FAILED VERSION REQUIREMENT FOR DNSMASQ. '
+-                              'DHCP AGENT MAY NOT RUN CORRECTLY! '
+-                              'Please ensure that its version is %s '
+-                              'or above!'), cls.MINIMUM_VERSION)
++                if float(ver) < 2.48:
++                    LOG.warning(_('FAILED VERSION REQUIREMENT FOR DNSMASQ. '
++                                  'DHCP AGENT MAY NOT RUN CORRECTLY! '
++                                  'Please ensure that its version is %s '
++                                  'or above!'), cls.MINIMUM_VERSION)
++                else:
++                    LOG.info(_('dnsmasq version: %s'), ver)
+         except (OSError, RuntimeError, IndexError, ValueError):
+             LOG.warning(_('Unable to determine dnsmasq version. '
+                           'Please ensure that its version is %s '