From: Ivan Udovichenko <iudovichenko@mirantis.com>
Date: Mon, 5 Jun 2017 13:39:16 +0000 (+0300)
Subject: [MCP 1.0] Update Heat package
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3a1635e9e20c6abd110861b519c18a22051b3390;p=openstack-build%2Fheat-build.git

[MCP 1.0] Update Heat package

Version: 1:6.0.0-5~u16.04+mcp0

* d/heat-api-cfn.logrotate, d/heat-api-cloudwatch.logrotate,
  d/heat-api.logrotate, d/heat-engine.logrotate: Remove files.
* d/heat-common.logrotate: Provide unified logrotate rule for
    all Heat log files.

Change-Id: I6512a2a03ab99e9019de5af154c35314ef5b62bd
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index fe7cc865..96788481 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,12 @@
+heat (1:6.0.0-5~u16.04+mcp0) mcp; urgency=medium
+
+  * d/heat-api-cfn.logrotate, d/heat-api-cloudwatch.logrotate,
+    d/heat-api.logrotate, d/heat-engine.logrotate: Remove files.
+  * d/heat-common.logrotate: Provide unified logrotate rule for
+      all Heat log files.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Mon, 05 Jun 2017 16:31:10 +0300
+
 heat (1:6.0.0-4~u16.04+mcp0) mcp; urgency=medium
 
   * Rebuild for xenial-mitaka mcp branch
diff --git a/xenial/debian/heat-api-cloudwatch.logrotate b/xenial/debian/heat-api-cloudwatch.logrotate
deleted file mode 100644
index b6c15721..00000000
--- a/xenial/debian/heat-api-cloudwatch.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/heat/heat-api-cloudwatch.log {
-    daily
-    missingok
-    compress 
-    delaycompress
-    notifempty   
-    copytruncate
-}
diff --git a/xenial/debian/heat-api.logrotate b/xenial/debian/heat-api.logrotate
deleted file mode 100644
index 76381611..00000000
--- a/xenial/debian/heat-api.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/heat/heat-api.log {
-    daily
-    missingok
-    compress 
-    delaycompress
-    notifempty   
-    copytruncate
-}
diff --git a/xenial/debian/heat-api-cfn.logrotate b/xenial/debian/heat-common.logrotate
similarity index 72%
rename from xenial/debian/heat-api-cfn.logrotate
rename to xenial/debian/heat-common.logrotate
index 452fdeed..894a6943 100644
--- a/xenial/debian/heat-api-cfn.logrotate
+++ b/xenial/debian/heat-common.logrotate
@@ -1,8 +1,8 @@
-/var/log/heat/heat-api-cfn.log {
+/var/log/heat/*.log {
     daily
     missingok
     compress
     delaycompress
-    notifempty
     copytruncate
+    notifempty
 }
diff --git a/xenial/debian/heat-engine.logrotate b/xenial/debian/heat-engine.logrotate
deleted file mode 100644
index ab9a9350..00000000
--- a/xenial/debian/heat-engine.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/heat/heat-engine.log {
-    daily
-    missingok
-    compress 
-    delaycompress
-    notifempty   
-    copytruncate
-}