diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-17 18:35:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-17 18:35:48 +0000 |
| commit | ac458c8ccc907903089197e7b34c1b0504d903a3 (patch) | |
| tree | d47d9726e61f21e85299a6179f565c94a37ffe2f | |
| parent | 08e4675df7db24ebf25e7865b0ed92489d34b9e2 (diff) | |
| parent | 4223fdfbeb7f972e6f23a67308a8357092e46ad0 (diff) | |
| download | kolla-ac458c8ccc907903089197e7b34c1b0504d903a3.tar.gz kolla-ac458c8ccc907903089197e7b34c1b0504d903a3.zip | |
Merge "Fix log directory of Elasticsearch"
| -rw-r--r-- | ansible/roles/elasticsearch/templates/elasticsearch.json.j2 | 5 | ||||
| -rw-r--r-- | ansible/roles/elasticsearch/templates/elasticsearch.yml.j2 | 2 | ||||
| -rw-r--r-- | docker/elasticsearch/extend_start.sh | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ansible/roles/elasticsearch/templates/elasticsearch.json.j2 b/ansible/roles/elasticsearch/templates/elasticsearch.json.j2 index 1e6c377a2..f34d2ea3b 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 b792eebf7..14f1bc471 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 ac78966fb..97067b7df 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 |