From e4cf9aef8c3c2b084d75dba9f3843273658f5baf Mon Sep 17 00:00:00 2001
From: Cyrille Verrier <cyrille.verrier@fabriscale.com>
Date: Fri, 16 Feb 2018 09:07:05 +0100
Subject: [PATCH] elasticsearch.yml: xpack settings added only if
 es_enable_xpack

the default values are:
 - es_enable_xpack: false
 - es_xpack_features: ["alerting","monitoring","graph","ml","security"]

With the default values, XPACK is not installed
But the generated elasticsearch.yml contains the XPACK Settings.
Elasticsearch application refuses to start with these unknown settings
---
 templates/elasticsearch.yml.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2
index f50c34d3..111f6f46 100644
--- a/templates/elasticsearch.yml.j2
+++ b/templates/elasticsearch.yml.j2
@@ -23,6 +23,7 @@ path.data: {{ data_dirs | array_to_str }}
 
 path.logs: {{ log_dir }}
 
+{% if es_enable_xpack %}
 {% if not "security" in es_xpack_features %}
 xpack.security.enabled: false
 {% endif %}
@@ -42,3 +43,4 @@ xpack.ml.enabled: false
 {% if not "graph" in es_xpack_features %}
 xpack.graph.enabled: false
 {% endif %}
+{% endif %}