Ubuntu Pastebin

Paste from chuck at Mon, 27 Mar 2017 16:51:04 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
diff --git a/debian/changelog b/debian/changelog
index 7b413d28..7671a1ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+neutron (2:10.0.0-0ubuntu4) UNRELEASED; urgency=medium
+
+  * d/neutron-common.install, d/neutron-dhcp-agent.install:
+    Remove cron jobs since they will cause a race when
+    using an L3 agent. (LP: #1623664)
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 27 Mar 2017 12:42:06 -0400
+
 neutron (2:10.0.0-0ubuntu3) zesty; urgency=medium
 
   * d/rules: Switch to direct use of ostestr.
diff --git a/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/debian/cron.d/neutron-dhcp-agent-netns-cleanup
deleted file mode 100644
index 826dbd74..00000000
--- a/debian/cron.d/neutron-dhcp-agent-netns-cleanup
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: set filetype=crontab:
-# Periodically cleans Neutron's network namespaces on behalf of the Neutron
-# DHCP agent.
-30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi
diff --git a/debian/cron.d/neutron-l3-agent-netns-cleanup b/debian/cron.d/neutron-l3-agent-netns-cleanup
deleted file mode 100644
index 8e4f1ad2..00000000
--- a/debian/cron.d/neutron-l3-agent-netns-cleanup
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: set filetype=crontab:
-# Periodically cleans Neutron's network namespaces on behalf of the Neutron
-# L3 agent.
-0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi
diff --git a/debian/cron.d/neutron-lbaas-agent-netns-cleanup b/debian/cron.d/neutron-lbaas-agent-netns-cleanup
deleted file mode 100644
index 92a4bc88..00000000
--- a/debian/cron.d/neutron-lbaas-agent-netns-cleanup
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: set filetype=crontab:
-# Periodically cleans Neutron's network namespaces on behalf of the Neutron
-# L3 agent.
-0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi
diff --git a/debian/neutron-common.install b/debian/neutron-common.install
index f3bc0936..aeea4d57 100644
--- a/debian/neutron-common.install
+++ b/debian/neutron-common.install
@@ -1,4 +1,3 @@
-debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
 debian/neutron_sudoers etc/sudoers.d
 etc/api-paste.ini etc/neutron
 etc/l3_agent.ini etc/neutron
diff --git a/debian/neutron-dhcp-agent.install b/debian/neutron-dhcp-agent.install
index 63e1dc3d..9633c7a9 100644
--- a/debian/neutron-dhcp-agent.install
+++ b/debian/neutron-dhcp-agent.install
@@ -1,4 +1,3 @@
-debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d
 etc/dhcp_agent.ini etc/neutron
 etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d
 usr/bin/neutron-dhcp-agent usr/bin
Download as text