Merge "Remove variables from volumes of rbmq and mariadb"

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']

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"]

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