[openstack-neutron/el6-havana] Update for 2013.2-13

Terry Wilson otherwiseguy at fedoraproject.org
Fri Dec 13 17:09:36 UTC 2013


commit 2e9d8a78a3e6eab9ff4dc8f4796ffecdcbcd716f
Author: Terry Wilson <twilson at redhat.com>
Date:   Fri Dec 13 09:42:09 2013 -0600

    Update for 2013.2-13
    
    QPID fixes from oslo-incubator, bz#1038711, bz#1038717
    Remove dnsmasq version warning, bz#1040196
    
    Resolves: rhbz#1038711
    Resolves: rhbz#1038717
    Resolves: rhbz#997961

 0004-Sync-rpc-fix-from-oslo-incubator.patch |   91 +++++++++++++++++++++++++++
 0005-Remove-dnsmasq-version-warning.patch   |   31 +++++++++
 openstack-neutron.spec                      |   11 +++-
 3 files changed, 132 insertions(+), 1 deletions(-)
---
diff --git a/0004-Sync-rpc-fix-from-oslo-incubator.patch b/0004-Sync-rpc-fix-from-oslo-incubator.patch
new file mode 100644
index 0000000..b83b61f
--- /dev/null
+++ b/0004-Sync-rpc-fix-from-oslo-incubator.patch
@@ -0,0 +1,91 @@
+From 24e98797994908d16c6c9ecfbc0f1af932a429f8 Mon Sep 17 00:00:00 2001
+From: Flavio Percoco <flaper87 at gmail.com>
+Date: Fri, 6 Dec 2013 15:35:14 +0100
+Subject: [PATCH] Sync rpc fix from oslo-incubator
+
+Sync the following fixes from oslo-incubator:
+
+e227c0e Properly reconnect subscribing clients when QPID broker restarts
+ef406a2 Create a shared queue for QPID topic consumers
+
+Closes-bug: #1251757
+Closes-bug: #1257293
+Change-Id: I286edf6bc4a677aa61f60da785802c19878c79c7
+(cherry picked from commit 9f9792972ff81f244931d830194aae979604ffa0)
+---
+ neutron/openstack/common/rpc/impl_qpid.py | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py
+index 026d392..67e0f9c 100644
+--- a/neutron/openstack/common/rpc/impl_qpid.py
++++ b/neutron/openstack/common/rpc/impl_qpid.py
+@@ -18,7 +18,6 @@
+ import functools
+ import itertools
+ import time
+-import uuid
+ 
+ import eventlet
+ import greenlet
+@@ -123,7 +122,6 @@ class ConsumerBase(object):
+                     },
+                 },
+                 "link": {
+-                    "name": link_name,
+                     "durable": True,
+                     "x-declare": {
+                         "durable": False,
+@@ -138,6 +136,7 @@ class ConsumerBase(object):
+                 "link": {
+                     "x-declare": {
+                         "auto-delete": True,
++                        "exclusive": False,
+                     },
+                 },
+             }
+@@ -145,6 +144,8 @@ class ConsumerBase(object):
+             raise_invalid_topology_version()
+ 
+         addr_opts["link"]["x-declare"].update(link_opts)
++        if link_name:
++            addr_opts["link"]["name"] = link_name
+ 
+         self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
+ 
+@@ -208,14 +209,16 @@ class DirectConsumer(ConsumerBase):
+         if conf.qpid_topology_version == 1:
+             node_name = "%s/%s" % (msg_id, msg_id)
+             node_opts = {"type": "direct"}
++            link_name = msg_id
+         elif conf.qpid_topology_version == 2:
+             node_name = "amq.direct/%s" % msg_id
+             node_opts = {}
++            link_name = None
+         else:
+             raise_invalid_topology_version()
+ 
+         super(DirectConsumer, self).__init__(conf, session, callback,
+-                                             node_name, node_opts, msg_id,
++                                             node_name, node_opts, link_name,
+                                              link_opts)
+ 
+ 
+@@ -266,16 +269,14 @@ class FanoutConsumer(ConsumerBase):
+         if conf.qpid_topology_version == 1:
+             node_name = "%s_fanout" % topic
+             node_opts = {"durable": False, "type": "fanout"}
+-            link_name = "%s_fanout_%s" % (topic, uuid.uuid4().hex)
+         elif conf.qpid_topology_version == 2:
+             node_name = "amq.topic/fanout/%s" % topic
+             node_opts = {}
+-            link_name = ""
+         else:
+             raise_invalid_topology_version()
+ 
+         super(FanoutConsumer, self).__init__(conf, session, callback,
+-                                             node_name, node_opts, link_name,
++                                             node_name, node_opts, None,
+                                              link_opts)
+ 
+ 
diff --git a/0005-Remove-dnsmasq-version-warning.patch b/0005-Remove-dnsmasq-version-warning.patch
new file mode 100644
index 0000000..b0fc5d3
--- /dev/null
+++ b/0005-Remove-dnsmasq-version-warning.patch
@@ -0,0 +1,31 @@
+From 11a6d5fc0021a23db86fd5ce81cb460a727f2573 Mon Sep 17 00:00:00 2001
+From: Terry Wilson <twilson at redhat.com>
+Date: Fri, 13 Dec 2013 09:41:43 -0600
+Subject: [PATCH] Remove dnsmasq version warning
+
+---
+ neutron/agent/linux/dhcp.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
+index 9e7481d..fbfb852 100644
+--- a/neutron/agent/linux/dhcp.py
++++ b/neutron/agent/linux/dhcp.py
+@@ -277,10 +277,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 '
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 091c8f5..682ada6 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2
-Release:	12%{?dist}
+Release:	13%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -57,6 +57,8 @@ 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
+Patch0004: 0004-Sync-rpc-fix-from-oslo-incubator.patch
+Patch0005: 0005-Remove-dnsmasq-version-warning.patch
 
 BuildArch:	noarch
 
@@ -425,6 +427,8 @@ IPSec.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -1006,8 +1010,13 @@ fi
 
 
 %changelog
+* Fri Dec 13 2013 Terry Wilson <twilson at redhat.com> - 2013.2-13
+- QPID fixes from oslo-incubator, bz#1038711, bz#1038717
+- Remove dnsmasq version warning, bz#997961
+
 * Mon Dec 09 2013 Terry Wilson <twilson at redhat.com> - 2013.2-12
 - Add vpnaas/fwaas configs to init scripts, bz#1032450
+- Pass neutron rootwrap.conf in sudoers.d/neutron, bz#984097
 
 * Wed Dec 04 2013 Terry Wilson <twilson at redhat.com> - 2013.2-11
 - Add missing debug and vpnaas rootwrap filters, bz#1034207


More information about the scm-commits mailing list