Merge ~fnordahl/ubuntu/+source/neutron:bug/1881852 into ubuntu/+source/neutron:ubuntu/devel

Proposed by Frode Nordahl
Status: Superseded
Proposed branch: ~fnordahl/ubuntu/+source/neutron:bug/1881852
Merge into: ubuntu/+source/neutron:ubuntu/devel
Diff against target: 85 lines (+54/-0) (has conflicts)
4 files modified
debian/changelog (+11/-0)
debian/neutron-common.install (+4/-0)
debian/patches/fix-neutron-ipset-cleanup-tool.patch (+35/-0)
debian/patches/series (+4/-0)
Conflict in debian/changelog
Conflict in debian/neutron-common.install
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Ubuntu Server Dev import team Pending
Review via email: mp+385034@code.launchpad.net
To post a comment you must log in.

Unmerged commits

c744c4f... by Frode Nordahl

Add missing rootwrap.d file and carry patch for in-flight fix

d/neutron-common.install: Add rootwrap.d/netns-cleanup.filters
(LP: #1881852)

d/p/fix-neutron-ipset-cleanup-tool.patch: Fix Traceback
(LP: #1881771)

bb5d9b3... by Corey Bryant

releasing package neutron version 2:16.0.0-0ubuntu1

082bb58... by Corey Bryant

d/p/monkey-patch-original-current-thread.patch: Dropped. Fixed in upstream release.

109b1a5... by Corey Bryant

New upstream release for OpenStack Ussuri (LP: #1877642).

af0e444... by Corey Bryant

Update upstream source from tag '16.0.0'

Update to upstream version '16.0.0'
with Debian dir b3cb5c481cf8d58a0a6d71575a624d586c36cd50

14df25d... by Corey Bryant

New upstream version 16.0.0

28700e2... by Corey Bryant

d/watch: Scope to 16.x series.

95493b3... by Corey Bryant

New upstream version 13.0.7

4f255d0... by Corey Bryant

releasing package neutron version 2:16.0.0~b3~git2020041516.5f42488a9a-0ubuntu3

d1442f3... by Corey Bryant

d/p/monkey-patch-original-current-thread.patch: Rebased

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4727a95..5f0ad7f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+<<<<<<< debian/changelog
7+=======
8+neutron (2:16.0.0-0ubuntu2) UNRELEASED; urgency=medium
9+
10+ * d/neutron-common.install: Add rootwrap.d/netns-cleanup.filters
11+ (LP: #1881852).
12+ * d/p/fix-neutron-ipset-cleanup-tool.patch: Fix Traceback (LP: #1881771).
13+
14+ -- Frode Nordahl <frode.nordahl@canonical.com> Wed, 3 Jun 2020 10:19:56 +0200
15+
16+>>>>>>> debian/changelog
17 neutron (2:16.0.0-0ubuntu1) groovy; urgency=medium
18
19 * d/watch: Scope to 16.x series.
20diff --git a/debian/neutron-common.install b/debian/neutron-common.install
21index 4f8f65c..2d02658 100644
22--- a/debian/neutron-common.install
23+++ b/debian/neutron-common.install
24@@ -20,5 +20,9 @@ etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
25 etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
26 etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
27 etc/neutron/rootwrap.d/linuxbridge-plugin.filters
28+<<<<<<< debian/neutron-common.install
29+=======
30+etc/neutron/rootwrap.d/netns-cleanup.filters
31+>>>>>>> debian/neutron-common.install
32 etc/neutron/rootwrap.d/openvswitch-plugin.filters
33 etc/rootwrap.conf etc/neutron
34diff --git a/debian/patches/fix-neutron-ipset-cleanup-tool.patch b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
35new file mode 100644
36index 0000000..8aa52f1
37--- /dev/null
38+++ b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
39@@ -0,0 +1,35 @@
40+From: Frode Nordahl <frode.nordahl@canonical.com>
41+Date: Tue, 2 Jun 2020 14:55:50 +0000 (+0200)
42+Subject: Fix Traceback when running neutron-ipset-cleanup tool
43+X-Git-Url: https://review.opendev.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff_plain;h=d57735ae0f01a4c0ae8c81dbdda62e07314face1
44+
45+Fix Traceback when running neutron-ipset-cleanup tool
46+
47+Some of the tools dependencies expect the AGENT group to be
48+present in the configuration, and at present it is not initialized,
49+this patch addresses that.
50+
51+Change-Id: I1a50e77749aaecc3966c9d238f91a1968ed454ef
52+Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
53+Closes-Bug: #1881771
54+---
55+
56+diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py
57+index c6bd40de6a4..9fecf73b586 100644
58+--- a/neutron/cmd/ipset_cleanup.py
59++++ b/neutron/cmd/ipset_cleanup.py
60+@@ -19,6 +19,7 @@ from oslo_log import log as logging
61+ from neutron.agent.linux import utils
62+ from neutron.common import config
63+ from neutron.conf.agent import cmd as command
64++from neutron.conf.agent import common as agent_config
65+
66+
67+ LOG = logging.getLogger(__name__)
68+@@ -31,6 +32,7 @@ def setup_conf():
69+ from the main config that do not apply during clean-up.
70+ """
71+ conf = cfg.CONF
72++ agent_config.register_root_helper(conf=conf)
73+ command.register_cmd_opts(command.ip_opts, conf)
74+ return conf
75diff --git a/debian/patches/series b/debian/patches/series
76index 209145c..239ad63 100644
77--- a/debian/patches/series
78+++ b/debian/patches/series
79@@ -1,2 +1,6 @@
80 skip-iptest.patch
81 flake8-legacy.patch
82+<<<<<<< debian/patches/series
83+=======
84+fix-neutron-ipset-cleanup-tool.patch
85+>>>>>>> debian/patches/series

Subscribers

People subscribed via source and target branches