CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 01:32:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve salt pillar/state/jinja race condition

Browse Source
This commit is contained in:
Jason Ertel
2021-06-02 14:34:21 -04:00
parent 20e896cacf
commit 588da4d7dc
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/elasticsearch/auth.sls
View File

@@ -7,6 +7,8 @@
elastic_auth_pillar: elastic_auth_pillar:
file.managed: file.managed:
- name: /opt/so/saltstack/local/pillar/elasticsearch/auth.sls - name: /opt/so/saltstack/local/pillar/elasticsearch/auth.sls
- mode 600
- reload_pillar: True
- contents: | - contents: |
elasticsearch: elasticsearch:
auth: auth:

1
salt/elasticsearch/files/curl.config.template Normal file
View File

@@ -0,0 +1 @@
user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"

3
salt/manager/init.sls
View File

@@ -110,8 +110,9 @@ strelka_yara_update:
elastic_curl_config_distributed: elastic_curl_config_distributed:
file.managed: file.managed:
- name: /opt/so/saltstack/local/salt/elasticsearch/curl.config - name: /opt/so/saltstack/local/salt/elasticsearch/curl.config
- source: salt://elasticsearch/files/curl.config.template
- template: jinja
- mode: 600 - mode: 600
- contents: user = "{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user') }}:{{ salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass') }}"
- show_changes: False - show_changes: False
# Must run before elasticsearch docker container is started! # Must run before elasticsearch docker container is started!