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

[Frode Nordahl]

Unmerged commits

c744c4f... by Frode Nordahl on 2020-06-03

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 on 2020-05-14

releasing package neutron version 2:16.0.0-0ubuntu1

082bb58... by Corey Bryant on 2020-05-13

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

109b1a5... by Corey Bryant on 2020-05-13

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

af0e444... by Corey Bryant on 2020-05-13

Update upstream source from tag '16.0.0'

Update to upstream version '16.0.0'
with Debian dir b3cb5c481cf8d58a0a6d71575a624d586c36cd50

14df25d... by Corey Bryant on 2020-05-13

New upstream version 16.0.0

28700e2... by Corey Bryant on 2020-05-13

d/watch: Scope to 16.x series.

95493b3... by Corey Bryant on 2020-05-05

New upstream version 13.0.7

4f255d0... by Corey Bryant on 2020-05-01

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

d1442f3... by Corey Bryant on 2020-05-01

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

diff --git a/debian/changelog b/debian/changelog
index 4727a95..5f0ad7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+<<<<<<< debian/changelog
+=======
+neutron (2:16.0.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/neutron-common.install: Add rootwrap.d/netns-cleanup.filters
+    (LP: #1881852).
+  * d/p/fix-neutron-ipset-cleanup-tool.patch: Fix Traceback (LP: #1881771).
+
+ -- Frode Nordahl <[e-mail]>  Wed,  3 Jun 2020 10:19:56 +0200
+
+>>>>>>> debian/changelog
 neutron (2:16.0.0-0ubuntu1) groovy; urgency=medium
 
   * 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
 etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
 etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
 etc/neutron/rootwrap.d/linuxbridge-plugin.filters
+<<<<<<< debian/neutron-common.install
+=======
+etc/neutron/rootwrap.d/netns-cleanup.filters
+>>>>>>> debian/neutron-common.install
 etc/neutron/rootwrap.d/openvswitch-plugin.filters
 etc/rootwrap.conf etc/neutron
diff --git a/debian/patches/fix-neutron-ipset-cleanup-tool.patch b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
new file mode 100644
index 0000000..8aa52f1
--- /dev/null
+++ b/debian/patches/fix-neutron-ipset-cleanup-tool.patch
@@ -0,0 +1,35 @@
+From: Frode Nordahl <[e-mail]>
+Date: Tue, 2 Jun 2020 14:55:50 +0000 (+0200)
+Subject: Fix Traceback when running neutron-ipset-cleanup tool
+X-Git-Url: https://review.opendev.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff_plain;h=d57735ae0f01a4c0ae8c81dbdda62e07314face1
+
+Fix Traceback when running neutron-ipset-cleanup tool
+
+Some of the tools dependencies expect the AGENT group to be
+present in the configuration, and at present it is not initialized,
+this patch addresses that.
+
+Change-Id: I1a50e77749aaecc3966c9d238f91a1968ed454ef
+Signed-off-by: Frode Nordahl <[e-mail]>
+Closes-Bug: #1881771
+---
+
+diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py
+index c6bd40de6a4..9fecf73b586 100644
+--- a/neutron/cmd/ipset_cleanup.py
++++ b/neutron/cmd/ipset_cleanup.py
+@@ -19,6 +19,7 @@ from oslo_log import log as logging
+ from neutron.agent.linux import utils
+ from neutron.common import config
+ from neutron.conf.agent import cmd as command
++from neutron.conf.agent import common as agent_config
+ 
+ 
+ LOG = logging.getLogger(__name__)
+@@ -31,6 +32,7 @@ def setup_conf():
+     from the main config that do not apply during clean-up.
+     """
+     conf = cfg.CONF
++    agent_config.register_root_helper(conf=conf)
+     command.register_cmd_opts(command.ip_opts, conf)
+     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 @@
 skip-iptest.patch
 flake8-legacy.patch
+<<<<<<< debian/patches/series
+=======
+fix-neutron-ipset-cleanup-tool.patch
+>>>>>>> debian/patches/series