neutron

Merge lp:~james-page/neutron/fixup-crontabs into lp:~openstack-ubuntu-testing/neutron/grizzly

  1. fixup-crontabs
  2. Merge into grizzly
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 146
Merged at revision: 146
Proposed branch: lp:~james-page/neutron/fixup-crontabs
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 54 lines (+14/-12)
4 files modified
debian/changelog (+8/-0)
debian/cron.d/quantum-dhcp-agent-netns-cleanup (+2/-4)
debian/cron.d/quantum-l3-agent-netns-cleanup (+2/-4)
debian/cron.d/quantum-lbaas-agent-netns-cleanup (+2/-4)
To merge this branch: bzr merge lp:~james-page/neutron/fixup-crontabs
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+160135@code.launchpad.net

Description of the change

Fixup crontabs

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-04-04 19:03:43 +0000
3+++ debian/changelog 2013-04-22 15:00:39 +0000
4@@ -1,3 +1,11 @@
5+quantum (1:2013.1-0ubuntu2) raring; urgency=low
6+
7+ * Fix invalid multi-line cron jobs (LP: #1170312):
8+ - d/cron.d/*: Consolidate jobs into a single command line, set syntax
9+ highlighting to type 'crontab'.
10+
11+ -- James Page <james.page@ubuntu.com> Mon, 22 Apr 2013 15:58:12 +0100
12+
13 quantum (1:2013.1-0ubuntu1) raring; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/cron.d/quantum-dhcp-agent-netns-cleanup'
18--- debian/cron.d/quantum-dhcp-agent-netns-cleanup 2012-09-27 18:11:36 +0000
19+++ debian/cron.d/quantum-dhcp-agent-netns-cleanup 2013-04-22 15:00:39 +0000
20@@ -1,6 +1,4 @@
21+# vim: set filetype=crontab:
22 # Periodically cleans Quantum's network namespaces on behalf of the Quantum
23 # DHCP agent.
24-30 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then \
25- /usr/bin/quantum-netns-cleanup \
26- --config-file=/etc/quantum/quantum.conf \
27- --config-file=/etc/quantum/dhcp_agent.ini >/dev/null 2>&1; fi
28+30 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/dhcp_agent.ini >/dev/null 2>&1; fi
29
30=== modified file 'debian/cron.d/quantum-l3-agent-netns-cleanup'
31--- debian/cron.d/quantum-l3-agent-netns-cleanup 2012-09-27 18:11:36 +0000
32+++ debian/cron.d/quantum-l3-agent-netns-cleanup 2013-04-22 15:00:39 +0000
33@@ -1,6 +1,4 @@
34+# vim: set filetype=crontab:
35 # Periodically cleans Quantum's network namespaces on behalf of the Quantum
36 # L3 agent.
37-0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then \
38- /usr/bin/quantum-netns-cleanup \
39- --config-file=/etc/quantum/quantum.conf \
40- --config-file=/etc/quantum/l3_agent.ini >/dev/null 2>&1; fi
41+0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/l3_agent.ini >/dev/null 2>&1; fi
42
43=== modified file 'debian/cron.d/quantum-lbaas-agent-netns-cleanup'
44--- debian/cron.d/quantum-lbaas-agent-netns-cleanup 2013-03-03 22:59:19 +0000
45+++ debian/cron.d/quantum-lbaas-agent-netns-cleanup 2013-04-22 15:00:39 +0000
46@@ -1,6 +1,4 @@
47+# vim: set filetype=crontab:
48 # Periodically cleans Quantum's network namespaces on behalf of the Quantum
49 # L3 agent.
50-0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then \
51- /usr/bin/quantum-netns-cleanup \
52- --config-file=/etc/quantum/quantum.conf \
53- --config-file=/etc/quantum/lbaas_agent.ini >/dev/null 2>&1; fi
54+0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then /usr/bin/quantum-netns-cleanup --config-file=/etc/quantum/quantum.conf --config-file=/etc/quantum/lbaas_agent.ini >/dev/null 2>&1; fi

Subscribers

People subscribed via source and target branches