From cc7b3899f7c92c002bd4dea70464193d627839b2 Mon Sep 17 00:00:00 2001
From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Thu, 18 Aug 2016 18:17:20 +0300
Subject: [PATCH] Remove variables from volumes of rbmq and mariadb

Change-Id: I8e3af19876e2c904aa3ac630fe98f4563fddf2aa
---
 service/files/heka-mariadb.toml.j2  | 2 +-
 service/files/heka-rabbitmq.toml.j2 | 2 +-
 service/heka.yaml                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/service/files/heka-mariadb.toml.j2 b/service/files/heka-mariadb.toml.j2
index 9086ac4..a744954 100644
--- a/service/files/heka-mariadb.toml.j2
+++ b/service/files/heka-mariadb.toml.j2
@@ -5,7 +5,7 @@ filename = "lua_decoders/os_mysql_log.lua"
 [mariadb_logstreamer_input]
 type = "LogstreamerInput"
 decoder = "mariadb_log_decoder"
-log_directory = "{{ mariadb_log_base }}"
+log_directory = "/var/log/ccp/mysql"
 file_match = 'mysql\.log\.?(?P<Seq>\d*)$'
 priority = ["^Seq"]
 differentiator = ['mysql']
diff --git a/service/files/heka-rabbitmq.toml.j2 b/service/files/heka-rabbitmq.toml.j2
index 2190087..aa15722 100644
--- a/service/files/heka-rabbitmq.toml.j2
+++ b/service/files/heka-rabbitmq.toml.j2
@@ -12,7 +12,7 @@ deliver_incomplete_final = true
 type = "LogstreamerInput"
 decoder = "rabbitmq_log_decoder"
 splitter = "rabbitmq_log_splitter"
-log_directory = "{{ rabbitmq_log_base }}"
+log_directory = "/var/log/ccp/rabbitmq"
 file_match = '(?P<Service>rabbitmq.*)\.log\.?(?P<Seq>\d*)$'
 priority = ["^Seq"]
 differentiator = ["Service"]
diff --git a/service/heka.yaml b/service/heka.yaml
index 16bbe2f..4ded19a 100644
--- a/service/heka.yaml
+++ b/service/heka.yaml
@@ -12,11 +12,11 @@ service:
           type: host
           path: /run/docker.sock
         - name: mysql-logs
-          path: "{{ mariadb_log_base }}"
+          path: "/var/log/ccp/mysql"
           type: host
           readOnly: True
         - name: rabbitmq-logs
-          path: "{{ rabbitmq_log_base }}"
+          path: "/var/log/ccp/rabbitmq"
           type: host
           readOnly: True
         - name: keystone-logs