Merge pull request #9417 from Security-Onion-Solutions/2.4/eval

Fix EVAL mode in 2.4

salt/utility/init.sls

@@ -1,4 +1,5 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
+{% from 'vars/globals.map.jinja' import GLOBALS %}
 
 {% if sls in allowed_states %}
   {% if grains['role'] in ['so-eval', 'so-import'] %}

salt/vars/eval.map.jinja

@@ -0,0 +1,13 @@
+{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %}
+
+{% set ROLE_GLOBALS = {} %}
+
+{% set EVAL_GLOBALS =
+   [
+     ELASTICSEARCH_GLOBALS
+   ]
+%}
+
+{% for sg in EVAL_GLOBALS %}
+{%   do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %}
+{% endfor %}