[MCP 1.0] Update Heat package

Version: 1:6.0.0-5~u14.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: I99d107ca21e5fd504829c012ac60fac708599fd0

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 7e6d2a7cc668a263ee02b72d4dfb3e9be2634c33..8fe021d8bf0e64e1ac8dbacb4c3665d14de3634f 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,12 @@
+heat (1:6.0.0-5~u14.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>  Tue, 06 Jun 2017 14:39:19 +0300
+
 heat (1:6.0.0-4~u14.04+mcp0) mcp; urgency=medium
 
   * Rebuild for trusty-mitaka mcp branch

diff --git a/trusty/debian/heat-api-cloudwatch.logrotate b/trusty/debian/heat-api-cloudwatch.logrotate
deleted file mode 100644 (file)
index b6c1572..0000000
--- a/trusty/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/trusty/debian/heat-api.logrotate b/trusty/debian/heat-api.logrotate
deleted file mode 100644 (file)
index 7638161..0000000
--- a/trusty/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/trusty/debian/heat-api-cfn.logrotate b/trusty/debian/heat-common.logrotate
similarity index 72%
rename from trusty/debian/heat-api-cfn.logrotate
rename to trusty/debian/heat-common.logrotate
index 452fdeed79d47e89012b4819270fb4e250ca8613..894a6943624d4da6f868e45c05e2887addbb78df 100644 (file)
--- a/trusty/debian/heat-api-cfn.logrotate
+++ b/trusty/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/trusty/debian/heat-engine.logrotate b/trusty/debian/heat-engine.logrotate
deleted file mode 100644 (file)
index ab9a935..0000000
--- a/trusty/debian/heat-engine.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/heat/heat-engine.log {
-    daily
-    missingok
-    compress 
-    delaycompress
-    notifempty   
-    copytruncate
-}