From: Thomas Goirand <thomas@goirand.fr>
Date: Sun, 12 Oct 2014 08:25:24 +0000 (+0800)
Subject: Now using a single logrotate file in neutron-common.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8b3e765dbc170b57e2d06e8277ee0840ebf996bf;p=openstack-build%2Fneutron-build.git

Now using a single logrotate file in neutron-common.

Rewritten-From: 5bc6b0e913b1f264ce8a6a5bbd6bd2e6b567c9ca
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 3e16a4faa..63c65f8f7 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -3,6 +3,7 @@ neutron (2014.2~rc2-1) experimental; urgency=medium
   * New upstream release.
   * Updated (build-)depends for this release.
   * Added ipset, iproute2, arping and keepalived as dependency.
+  * Now using a single logrotate file in neutron-common.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 10 Oct 2014 23:11:10 +0800
 
diff --git a/trusty/debian/neutron-common.logrotate b/trusty/debian/neutron-common.logrotate
index 2002058d5..c39eca5e9 100644
--- a/trusty/debian/neutron-common.logrotate
+++ b/trusty/debian/neutron-common.logrotate
@@ -1,4 +1,4 @@
-/var/log/neutron/neutron-ns-metadata-proxy*.log {
+/var/log/neutron/*.log {
     daily
     missingok
     compress
diff --git a/trusty/debian/neutron-dhcp-agent.logrotate b/trusty/debian/neutron-dhcp-agent.logrotate
deleted file mode 100644
index da6aff1b4..000000000
--- a/trusty/debian/neutron-dhcp-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-dhcp-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-l3-agent.logrotate b/trusty/debian/neutron-l3-agent.logrotate
deleted file mode 100644
index e81917fb5..000000000
--- a/trusty/debian/neutron-l3-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-l3-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-lbaas-agent.logrotate b/trusty/debian/neutron-lbaas-agent.logrotate
deleted file mode 100644
index 9b2d71775..000000000
--- a/trusty/debian/neutron-lbaas-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-lbaas-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-metadata-agent.logrotate b/trusty/debian/neutron-metadata-agent.logrotate
deleted file mode 100644
index 9bfea2f03..000000000
--- a/trusty/debian/neutron-metadata-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-metadata-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-metering-agent.logrotate b/trusty/debian/neutron-metering-agent.logrotate
deleted file mode 100644
index e3f2a5b28..000000000
--- a/trusty/debian/neutron-metering-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-metering-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate b/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate
deleted file mode 100644
index b3ad82bfe..000000000
--- a/trusty/debian/neutron-plugin-linuxbridge-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-linuxbridge-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-plugin-nec-agent.logrotate b/trusty/debian/neutron-plugin-nec-agent.logrotate
deleted file mode 100644
index 39fa2a24f..000000000
--- a/trusty/debian/neutron-plugin-nec-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-nec-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate b/trusty/debian/neutron-plugin-openvswitch-agent.logrotate
deleted file mode 100644
index 7dfc813b3..000000000
--- a/trusty/debian/neutron-plugin-openvswitch-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-openvswitch-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/trusty/debian/neutron-server.logrotate b/trusty/debian/neutron-server.logrotate
deleted file mode 100644
index eca7422c6..000000000
--- a/trusty/debian/neutron-server.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-server.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
\ No newline at end of file
diff --git a/trusty/debian/neutron-vpn-agent.logrotate b/trusty/debian/neutron-vpn-agent.logrotate
deleted file mode 100644
index bb1796685..000000000
--- a/trusty/debian/neutron-vpn-agent.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/neutron/neutron-vpn-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}