From d395869912e22c30d435919c902fcfd8eb59c790 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 2 Dec 2013 22:54:00 +0800 Subject: [PATCH] Fixed the cron.d files for lbass, dhcp and l3, so that they are on a single line instead of broken lines with \ (this doesn't work otherwise). Change-Id: Id95a56ffadcc8fe01c517d39bb0716d320ccdc19 --- debian/changelog | 2 ++ debian/cron.d/neutron-dhcp-agent-netns-cleanup | 5 +---- debian/cron.d/neutron-l3-agent-netns-cleanup | 5 +---- debian/cron.d/neutron-lbaas-agent-netns-cleanup | 5 +---- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 142a62dd7..e151f6c24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ neutron (2013.2-7) UNRELEASED; urgency=low * neutron-l3-agent & neutron-vpn-agent now conflicts with each other. + * Fixed the cron.d files for lbass, dhcp and l3, so that they are on a single + line instead of broken lines with \ (this doesn't work otherwise). -- Thomas Goirand Mon, 02 Dec 2013 22:39:46 +0800 diff --git a/debian/cron.d/neutron-dhcp-agent-netns-cleanup b/debian/cron.d/neutron-dhcp-agent-netns-cleanup index 54fdb9268..69654c2bb 100644 --- a/debian/cron.d/neutron-dhcp-agent-netns-cleanup +++ b/debian/cron.d/neutron-dhcp-agent-netns-cleanup @@ -1,6 +1,3 @@ # 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 +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 index 997a76d0f..e59205e69 100644 --- a/debian/cron.d/neutron-l3-agent-netns-cleanup +++ b/debian/cron.d/neutron-l3-agent-netns-cleanup @@ -1,6 +1,3 @@ # 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 +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 index fa4c455eb..f7595b75b 100644 --- a/debian/cron.d/neutron-lbaas-agent-netns-cleanup +++ b/debian/cron.d/neutron-lbaas-agent-netns-cleanup @@ -1,6 +1,3 @@ # Periodically cleans Neutron's network namespaces on behalf of the Neutron LBaaS 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 +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 -- 2.45.2