From d0c87cd31748e2a3b44cd4f27bca07b2ebcc97fb Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 17 Sep 2021 12:11:12 -0400
Subject: [PATCH] allow for pillar override of defaults

---
 salt/elasticsearch/config.map.jinja |  2 ++
 salt/elasticsearch/init.sls         | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index 81ff4d157..ec05c0e14 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -28,3 +28,5 @@
     {% do ESCONFIG.elasticsearch.config.discovery.update({'seed_hosts': [grains.master]}) %}
   {% endif %}
 {% endif %}
+
+{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index f5d983869..9f475c2c3 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -152,17 +152,9 @@ esyml:
     - user: 930
     - group: 939
     - defaults:
-        ESCONFIG: {{ ESCONFIG.elasticsearch.config }}
+        ESCONFIG: {{ ESCONFIG }}
     - template: jinja
 
-
-esyml_test:
-  file.managed:
-    - name: /tmp/elasticsearch.yml
-    - user: 930
-    - group: 939
-    - contents: {{ ESCONFIG | yaml }}
-
 #sync templates to /opt/so/conf/elasticsearch/templates
 {% for TEMPLATE in TEMPLATES %}
 es_template_{{TEMPLATE.split('.')[0] | replace("/","_") }}: