Merge branch 'master' into kilo

This commit is contained in:
Jason Ertel
2021-07-20 11:44:10 -04:00
4 changed files with 15 additions and 17 deletions

View File

@@ -18,17 +18,15 @@ client:
hosts:
- {{elasticsearch}}
port: 9200
{% if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
username: {{ ES_USER }}
password: {{ ES_PASS }}
{% endif %}
{%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
http_auth: {{ ES_USER }}:{{ ES_PASS }}
{%- endif %}
url_prefix:
use_ssl: True
certificate:
client_cert:
client_key:
ssl_no_validate: True
http_auth:
timeout: 30
master_only: False