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

Fix EVAL mode in 2.4

pillar/top.sls

@@ -64,10 +64,11 @@ base:
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
     - elasticsearch.auth
     {% endif %}
-    - kibana.secrets
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
-    - soc_global
+    - kibana.secrets
     {% endif %}
+    - soc_global
+    - kratos.soc_kratos
     - elasticsearch.soc_elasticsearch
     - manager.soc_manager
     - soc.soc_soc

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 %}

setup/so-setup

@@ -332,7 +332,6 @@ if ! [[ -f $install_opt_file ]]; then
 		get_redirect
 		collect_so_allow
 		whiptail_end_settings
-		# Start the install
 	elif [[ $is_standalone ]]; then
 		waitforstate=true
 		monints=true