From 4223fdfbeb7f972e6f23a67308a8357092e46ad0 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Mon, 17 Oct 2016 10:46:02 +0200
Subject: [PATCH] Fix log directory of Elasticsearch

Logs should be stored in /var/log/kolla/elasticsearch.

Change-Id: If3ba4ec6ce2dbe9859ca604f0ee2df7fc4d15bd9
Closes-bug: #1634046
---
 .../roles/elasticsearch/templates/elasticsearch.json.j2    | 5 +++++
 ansible/roles/elasticsearch/templates/elasticsearch.yml.j2 | 2 +-
 docker/elasticsearch/extend_start.sh                       | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/elasticsearch/templates/elasticsearch.json.j2 b/ansible/roles/elasticsearch/templates/elasticsearch.json.j2
index 1e6c377a2e..f34d2ea3bb 100644
--- a/ansible/roles/elasticsearch/templates/elasticsearch.json.j2
+++ b/ansible/roles/elasticsearch/templates/elasticsearch.json.j2
@@ -13,6 +13,11 @@
             "path": "/var/lib/elasticsearch",
             "owner": "elasticsearch:elasticsearch",
             "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/elasticsearch",
+            "owner": "elasticsearch:elasticsearch",
+            "recurse": true
         }
     ]
 }
diff --git a/ansible/roles/elasticsearch/templates/elasticsearch.yml.j2 b/ansible/roles/elasticsearch/templates/elasticsearch.yml.j2
index b792eebf75..14f1bc4711 100644
--- a/ansible/roles/elasticsearch/templates/elasticsearch.yml.j2
+++ b/ansible/roles/elasticsearch/templates/elasticsearch.yml.j2
@@ -15,5 +15,5 @@ gateway.recover_after_time: "5m"
 gateway.recover_after_nodes: {{ recover_after_nodes }}
 path.conf: "/etc/elasticsearch"
 path.data: "/var/lib/elasticsearch/data"
-path.logs: "/var/log/elasticsearch"
+path.logs: "/var/log/kolla/elasticsearch"
 path.scripts: "/etc/elasticsearch/scripts"
diff --git a/docker/elasticsearch/extend_start.sh b/docker/elasticsearch/extend_start.sh
index ac78966fb2..97067b7df9 100644
--- a/docker/elasticsearch/extend_start.sh
+++ b/docker/elasticsearch/extend_start.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+if [[ ! -d "/var/log/kolla/elasticsearch" ]]; then
+    mkdir -p /var/log/kolla/elasticsearch
+fi
+if [[ $(stat -c %a /var/log/kolla/elasticsearch) != "755" ]]; then
+    chmod 755 /var/log/kolla/elasticsearch
+fi
+
 # Only update permissions if permissions need to be updated
 if [[ $(stat -c %U:%G /var/lib/elasticsearch/data) != "elasticsearch:elasticsearch" ]]; then
     sudo chown elasticsearch: /var/lib/elasticsearch/data