From: thouveng <thouveng@gmail.com>
Date: Mon, 5 Dec 2016 09:38:27 +0000 (+0100)
Subject: Merge pull request #23 from thouveng/seperate-config-and-objects
X-Git-Tag: 2016.12~2
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=033675c52d32df928df572630b78e67cb3f624f5;hp=3ad837a7bf51351e2c0ba896fb68f32d7080f970

Merge pull request #23 from thouveng/seperate-config-and-objects

Separate the configuration and other part fo the client
---

diff --git a/README.rst b/README.rst
index 08bd72a..966b6b7 100644
--- a/README.rst
+++ b/README.rst
@@ -68,6 +68,7 @@ Common definition for curator:
           timeout: 900
           logfile: /var/log/elasticsearch/curator.log
           logformat: json
+          master_only: true
           actions:
             - action: delete_indices
               description: >-
diff --git a/elasticsearch/files/curator.yml b/elasticsearch/files/curator.yml
index 6bb8f1e..4bdec0c 100644
--- a/elasticsearch/files/curator.yml
+++ b/elasticsearch/files/curator.yml
@@ -17,7 +17,7 @@ client:
   ssl_no_validate: False
   http_auth:
   timeout: {{ server.curator.timeout|default(120) }}
-  master_only: False
+  master_only: {{ server.curator.get('master_only', False)|lower }}
 
 logging:
   loglevel: {{ server.curator.loglevel|default("INFO") }}