From af149d04a97602d082a3cc91633335d034c4f400 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Wed, 16 Dec 2020 09:18:40 -0500
Subject: [PATCH] [fix] Only run portions of ES state, do not run container

---
 salt/common/tools/sbin/so-image-common | 1 -
 salt/elasticsearch/init.sls            | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/salt/common/tools/sbin/so-image-common b/salt/common/tools/sbin/so-image-common
index 01bb9727c..767f9d21c 100755
--- a/salt/common/tools/sbin/so-image-common
+++ b/salt/common/tools/sbin/so-image-common
@@ -84,7 +84,6 @@ container_list() {
     TRUSTED_CONTAINERS=(
       "so-filebeat"
       "so-idstools"
-      "so-elasticsearch"
       "so-logstash"
       "so-nginx"
       "so-redis"
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 3e0bac708..fdd9b4565 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -86,6 +86,8 @@ capemz:
     - user: 939
     - group: 939
 
+{% if grains['role'] != 'so-helix' %}
+
 # Add ES Group
 elasticsearchgroup:
   group.present:
@@ -251,10 +253,12 @@ so-elasticsearch-templates:
     - template: jinja
 {% endif %}
 
+{% endif %} {# if grains['role'] != 'so-helix' #}
+
 {% else %}
 
 elasticsearch_state_not_allowed:
   test.fail_without_changes:
     - name: elasticsearch_state_not_allowed
 
-{% endif %}
+{% endif %} {# if 'elasticsearch' in top_states #}