Ubuntu
neutron package

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

  1. Git
  2. lp:~fnordahl/ubuntu/+source/neutron
  3. bug/1881852
  4. Merge into 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
git-ubuntu developers 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
diff --git a/debian/changelog b/debian/changelog
index 4727a95..5f0ad7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
1<<<<<<< debian/changelog
2=======
3neutron (2:16.0.0-0ubuntu2) UNRELEASED; urgency=medium
4
5 * d/neutron-common.install: Add rootwrap.d/netns-cleanup.filters
6 (LP: #1881852).
7 * d/p/fix-neutron-ipset-cleanup-tool.patch: Fix Traceback (LP: #1881771).
8
9 -- Frode Nordahl <frode.nordahl@canonical.com> Wed, 3 Jun 2020 10:19:56 +0200
10
11>>>>>>> debian/changelog
1neutron (2:16.0.0-0ubuntu1) groovy; urgency=medium12neutron (2:16.0.0-0ubuntu1) groovy; urgency=medium
213
3 * d/watch: Scope to 16.x series.14 * d/watch: Scope to 16.x series.
diff --git a/debian/neutron-common.install b/debian/neutron-common.install
index 4f8f65c..2d02658 100644
--- a/debian/neutron-common.install
+++ b/debian/neutron-common.install
@@ -20,5 +20,9 @@ etc/neutron/rootwrap.d/ipset-firewall.filters etc/neutron/rootwrap.d
20etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d20etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
21etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d21etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
22etc/neutron/rootwrap.d/linuxbridge-plugin.filters22etc/neutron/rootwrap.d/linuxbridge-plugin.filters
23<<<<<<< debian/neutron-common.install
24=======
25etc/neutron/rootwrap.d/netns-cleanup.filters
26>>>>>>> debian/neutron-common.install
23etc/neutron/rootwrap.d/openvswitch-plugin.filters27etc/neutron/rootwrap.d/openvswitch-plugin.filters
24etc/rootwrap.conf etc/neutron28etc/rootwrap.conf etc/neutron
diff --git a/debian/patches/fix-neutron-ipset-cleanup-tool.patch b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
25new file mode 10064429new file mode 100644
index 0000000..8aa52f1
--- /dev/null
+++ b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
@@ -0,0 +1,35 @@
1From: Frode Nordahl <frode.nordahl@canonical.com>
2Date: Tue, 2 Jun 2020 14:55:50 +0000 (+0200)
3Subject: Fix Traceback when running neutron-ipset-cleanup tool
4X-Git-Url: https://review.opendev.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff_plain;h=d57735ae0f01a4c0ae8c81dbdda62e07314face1
5
6Fix Traceback when running neutron-ipset-cleanup tool
7
8Some of the tools dependencies expect the AGENT group to be
9present in the configuration, and at present it is not initialized,
10this patch addresses that.
11
12Change-Id: I1a50e77749aaecc3966c9d238f91a1968ed454ef
13Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
14Closes-Bug: #1881771
15---
16
17diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py
18index c6bd40de6a4..9fecf73b586 100644
19--- a/neutron/cmd/ipset_cleanup.py
20+++ b/neutron/cmd/ipset_cleanup.py
21@@ -19,6 +19,7 @@ from oslo_log import log as logging
22 from neutron.agent.linux import utils
23 from neutron.common import config
24 from neutron.conf.agent import cmd as command
25+from neutron.conf.agent import common as agent_config
26
27
28 LOG = logging.getLogger(__name__)
29@@ -31,6 +32,7 @@ def setup_conf():
30 from the main config that do not apply during clean-up.
31 """
32 conf = cfg.CONF
33+ agent_config.register_root_helper(conf=conf)
34 command.register_cmd_opts(command.ip_opts, conf)
35 return conf
diff --git a/debian/patches/series b/debian/patches/series
index 209145c..239ad63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
1skip-iptest.patch1skip-iptest.patch
2flake8-legacy.patch2flake8-legacy.patch
3<<<<<<< debian/patches/series
4=======
5fix-neutron-ipset-cleanup-tool.patch
6>>>>>>> debian/patches/series

Subscribers

People subscribed via source and target branches