Merge pull request #427 from cyrilleverrier/fix_elasticsearch_yml_j2

elasticsearch.yml: xpack settings added only if es_enable_xpack
elastic · Feb 21, 2018 · 644a209 · 644a209
2 parents 143cf8b + e4cf9ae
commit 644a209
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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 %}