first round of fixes for eval mode

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