From ca9f7ae18bd57328d6942cb0811cd2051ec45e44 Mon Sep 17 00:00:00 2001
From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Thu, 18 Aug 2016 18:27:51 +0300
Subject: [PATCH] Remove variables for mariadb volume

Change-Id: I333e9d89e56ff292bc3da2c636eb53e80b8c62d3
---
 service/files/defaults.yaml | 1 -
 service/files/my.cnf.j2     | 2 +-
 service/mariadb.yaml        | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index c406c4b..4e01fbb 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -2,4 +2,3 @@ configs:
     db_max_timeout: 60
     db_root_password: password
     mariadb_port: 3306
-    mariadb_log_base: /var/log/ccp/mysql
diff --git a/service/files/my.cnf.j2 b/service/files/my.cnf.j2
index 6225ed6..90cb31a 100644
--- a/service/files/my.cnf.j2
+++ b/service/files/my.cnf.j2
@@ -3,7 +3,7 @@ bind-address = {{ network_topology["private"]["address"] }}
 port = {{ mariadb_port }}
 
 datadir=/var/lib/mysql/
-log-error={{ mariadb_log_base }}/mysql.log
+log-error=/var/log/ccp/mysql/mysql.log
 max_connections=10000
 
 log-bin=mariadb-bin
diff --git a/service/mariadb.yaml b/service/mariadb.yaml
index 20fc924..1d76033 100644
--- a/service/mariadb.yaml
+++ b/service/mariadb.yaml
@@ -10,12 +10,12 @@ service:
         liveness: "true"
       volumes:
       - name: mysql-logs
-        path: "{{ mariadb_log_base }}"
+        path: "/var/log/ccp/mysql"
         type: host
         readOnly: False
       pre:
         - name: chown-logs-dir
-          command: "sudo /bin/chown mysql:mysql {{ mariadb_log_base }}"
+          command: "sudo /bin/chown mysql:mysql /var/log/ccp/mysql"
         - name: mariadb-bootstrap
           command: /opt/ccp/bin/mariadb-bootstrap.sh
       daemon: