From 2d9ebf31682454223a70a988d4d66487d52c27f9 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 7 Oct 2014 13:47:47 +0800
Subject: [PATCH] Now using a single cinder-common.logrotate file instead of so
 many.

---
 debian/changelog                                         | 1 +
 debian/cinder-backup.logrotate                           | 8 --------
 debian/{cinder-api.logrotate => cinder-common.logrotate} | 2 +-
 debian/cinder-scheduler.logrotate                        | 8 --------
 debian/cinder-volume.logrotate                           | 8 --------
 5 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 debian/cinder-backup.logrotate
 rename debian/{cinder-api.logrotate => cinder-common.logrotate} (72%)
 delete mode 100644 debian/cinder-scheduler.logrotate
 delete mode 100644 debian/cinder-volume.logrotate

diff --git a/debian/changelog b/debian/changelog
index 2c004e15a..028928a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cinder (2014.2~rc1-2) UNRELEASED; urgency=medium
 
   * Switching to templated init scripts using openstack-pkg-tools >= 13.
   * Mangling upstream rc and beta versions in watch file.
+  * Now using a single cinder-common.logrotate file instead of so many.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 05 Oct 2014 14:23:48 +0800
 
diff --git a/debian/cinder-backup.logrotate b/debian/cinder-backup.logrotate
deleted file mode 100644
index 68c6d58ba..000000000
--- a/debian/cinder-backup.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-backup.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/debian/cinder-api.logrotate b/debian/cinder-common.logrotate
similarity index 72%
rename from debian/cinder-api.logrotate
rename to debian/cinder-common.logrotate
index c7a981e58..f96b1b8bb 100644
--- a/debian/cinder-api.logrotate
+++ b/debian/cinder-common.logrotate
@@ -1,4 +1,4 @@
-/var/log/cinder/cinder-api.log {
+/var/log/cinder/*.log {
     daily
     missingok
     compress
diff --git a/debian/cinder-scheduler.logrotate b/debian/cinder-scheduler.logrotate
deleted file mode 100644
index c09beb047..000000000
--- a/debian/cinder-scheduler.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-scheduler.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
diff --git a/debian/cinder-volume.logrotate b/debian/cinder-volume.logrotate
deleted file mode 100644
index 1f5fca8d6..000000000
--- a/debian/cinder-volume.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cinder/cinder-volume.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-    copytruncate
-}
-- 
2.45.2