manager and common states now require elasticsearch.auth state

This commit is contained in:
m0duspwnens
2021-05-28 15:26:26 -04:00
parent 68abaa5e3c
commit edf60f80f7
2 changed files with 13 additions and 1 deletions

View File

@@ -3,6 +3,12 @@
{% set role = grains.id.split('_') | last %} {% set role = grains.id.split('_') | last %}
{% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %} {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
{% set ES_INCLUDED_NODES = ['so-standalone'] %}
{% if grains.role in ES_INCLUDED_NODES %}
include:
- elasticsearch.auth
{% %}
# Remove variables.txt from /tmp - This is temp # Remove variables.txt from /tmp - This is temp
rmvariablesfile: rmvariablesfile:
@@ -179,7 +185,10 @@ utilsyncscripts:
- source: salt://common/tools/sbin - source: salt://common/tools/sbin
- defaults: - defaults:
ELASTICCURL: {{ ELASTICAUTH.elasticcurl }} ELASTICCURL: {{ ELASTICAUTH.elasticcurl }}
{% if grains.role in ES_INCLUDED_NODES %}
- require:
- file: elastic_auth_pillar
{% endif %}
{% if role in ['eval', 'standalone', 'sensor', 'heavynode'] %} {% if role in ['eval', 'standalone', 'sensor', 'heavynode'] %}
# Add sensor cleanup # Add sensor cleanup

View File

@@ -20,6 +20,9 @@
{% set MANAGER = salt['grains.get']('master') %} {% set MANAGER = salt['grains.get']('master') %}
{% set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') %} {% set STRELKA_RULES = salt['pillar.get']('strelka:rules', '1') %}
include:
- elasticsearch.auth
socore_own_saltstack: socore_own_saltstack:
file.directory: file.directory:
- name: /opt/so/saltstack - name: /opt/so/saltstack