commit 73f12db7c1d2a22d94426bacbece9bb68c728c1a
author Anton Samoylov <asamoylov@mirantis.com> Wed Dec 12 18:34:24 2018 +0400
committer Anton Samoylov <asamoylov@mirantis.com> Fri Dec 14 14:44:43 2018 +0400
tree 0b1ce1e304d6e269838e67effc9a4d8197202222
parent 895c29b19304bf71dc6f626004ebdc7c5b824fc5

Use variables for kafka config/log dirs as they can be different,
starting from OC 4.1

Change-Id: Ib1de79627ae889794b63d778b5cc861f43972198
Related-PROD: PROD-25533

opencontrail/control/cluster.yml

diff --git a/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
index 28c12c4..33bfedc 100644
--- a/opencontrail/control/cluster.yml
+++ b/opencontrail/control/cluster.yml
@@ -7,7 +7,7 @@
 parameters:
   _param:
     opencontrail_kafka_log_cleanup_mtime: '+7'
-    opencontrail_kafka_log_cleanup_dir: '/usr/share/kafka/logs/'
+    opencontrail_kafka_log_dir: '/usr/share/kafka/logs'
 # Temprorary fix for MOS9 packages to pin old version of kafka
   linux:
     system:
@@ -21,7 +21,7 @@
         - nf_conntrack_ipv4
       job:
         kafka_logs_cleanup:
-          command: "find ${_param:opencontrail_kafka_log_cleanup_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
+          command: "find ${_param:opencontrail_kafka_log_dir} -name '*.log.*' -type f -mtime ${_param:opencontrail_kafka_log_cleanup_mtime} -exec rm {} \\;"
           identifier: kafka_logs_cleanup
           hour: 0
           minute: 0