Switched from restarting daemons to copytruncate for logrotate.

Change-Id: Id7529a82ba4baba916ced64e7b12b4e7a88520d3

Rewritten-From: 0116ea5163191091a76d039fd1505dbc613c925e

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7233f613f2cc4fcc40f558800f83e33101c969fa..dcc13dfdda0453c2eb885581073e8a0e96ce2bb3 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2014.1-5) unstable; urgency=medium
+
+  * Switched from restarting daemons to copytruncate for logrotate.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 29 May 2014 13:44:03 +0800
+
 neutron (2014.1-4) unstable; urgency=medium
 
   * Fixed linuxbridge init script.

diff --git a/trusty/debian/neutron-common.logrotate b/trusty/debian/neutron-common.logrotate
index a322f10b366b177882c4af2976f3bb390e838ce4..2002058d5a669744c960dc7a5d80d4d81745e2a3 100644 (file)
--- a/trusty/debian/neutron-common.logrotate
+++ b/trusty/debian/neutron-common.logrotate
@@ -3,4 +3,5 @@
     missingok
     compress
     delaycompress
+    copytruncate
 }

diff --git a/trusty/debian/neutron-dhcp-agent.logrotate b/trusty/debian/neutron-dhcp-agent.logrotate
index 7519f8c7fcec99dfc5261619be73401122a11668..b0b9384dc88e7962b4ea1a391deef2e2f1338e47 100644 (file)
--- a/trusty/debian/neutron-dhcp-agent.logrotate
+++ b/trusty/debian/neutron-dhcp-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-dhcp-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-dhcp-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-l3-agent.logrotate b/trusty/debian/neutron-l3-agent.logrotate
index f89414806590819dc6e0a1496fd72db6b19f3e59..8db10721471206639c7168487bbe186a8677e85b 100644 (file)
--- a/trusty/debian/neutron-l3-agent.logrotate
+++ b/trusty/debian/neutron-l3-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-l3-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-l3-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-lbaas-agent.logrotate b/trusty/debian/neutron-lbaas-agent.logrotate
index 548c5d3be255ec9114a2d6e0239b809bf223b8de..078c729e884c40f8d3bd6002a8d5a802b4588f77 100644 (file)
--- a/trusty/debian/neutron-lbaas-agent.logrotate
+++ b/trusty/debian/neutron-lbaas-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-lbaas-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-lbaas-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-metadata-agent.logrotate b/trusty/debian/neutron-metadata-agent.logrotate
index 2d5c02631e69ed5c0c51c5bb59952c73b5a2260e..bad11bb0d3d81881e0874ae305dbed358f760740 100644 (file)
--- a/trusty/debian/neutron-metadata-agent.logrotate
+++ b/trusty/debian/neutron-metadata-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-metadata-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-metadata-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-metering-agent.logrotate b/trusty/debian/neutron-metering-agent.logrotate
index a1db75adb1fa48d80ffe688ef04ef5a5b11c1f49..e3923c068883e069a7fd6b07d10776fff8fd2f90 100644 (file)
--- a/trusty/debian/neutron-metering-agent.logrotate
+++ b/trusty/debian/neutron-metering-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-metering-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-metering-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate b/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate
index 8535f498de849b285f5ed89ac5744e1fa037168e..0a5b085e105cad26abc614def8ff693c25d0d2c0 100644 (file)
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate
+++ b/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-plugin-linuxbridge-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-plugin-linuxbridge-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-plugin-nec-agent.logrotate b/trusty/debian/neutron-plugin-nec-agent.logrotate
index a2595afcb8cb9e708e92bf787e4195be0494bec5..f204c8248fbb77866b96867192d9fcc7a7f6f6f7 100644 (file)
--- a/trusty/debian/neutron-plugin-nec-agent.logrotate
+++ b/trusty/debian/neutron-plugin-nec-agent.logrotate
@@ -4,4 +4,5 @@
     compress
     delaycompress
     notifempty
+    copytruncate
 }

diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate b/trusty/debian/neutron-plugin-openvswitch-agent.logrotate
index b3a4b57d42d64ebf6e2ac758105c959ad327bdf6..60e2b40b88dce486df04821b70da27a54dd50aaa 100644 (file)
--- a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate
+++ b/trusty/debian/neutron-plugin-openvswitch-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-plugin-openvswitch-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-plugin-openvswitch-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }

diff --git a/trusty/debian/neutron-server.logrotate b/trusty/debian/neutron-server.logrotate
index 0bac800acd9441cdff35730f93f2aa6809b1dec0..eca7422c65e05dae00736ff4e355a7883af98165 100644 (file)
--- a/trusty/debian/neutron-server.logrotate
+++ b/trusty/debian/neutron-server.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-server restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-server restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }
\ No newline at end of file

diff --git a/trusty/debian/neutron-vpn-agent.logrotate b/trusty/debian/neutron-vpn-agent.logrotate
index 89a4c9a3fec2dad4de62784ac71715b2cc9349b9..70adb899f9918c045d9c3cb8b4fafa374aa894b6 100644 (file)
--- a/trusty/debian/neutron-vpn-agent.logrotate
+++ b/trusty/debian/neutron-vpn-agent.logrotate
@@ -4,11 +4,5 @@
     compress
     delaycompress
     notifempty
-    postrotate
-        if dpkg-vendor --derives-from ubuntu ; then
-            service neutron-vpn-agent restart >/dev/null 2>&1 || true
-        else
-            invoke-rc.d neutron-vpn-agent restart >/dev/null 2>&1 || true
-        fi
-    endscript
+    copytruncate
 }