From 04b4030eb69435aaf27e0f3050dd7ad5b50b3191 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 13 Oct 2022 12:31:41 -0400 Subject: [PATCH] only add elasticsearch.auth to elasticsearch global var if auth exists --- salt/vars/elasticsearch.map.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/vars/elasticsearch.map.jinja b/salt/vars/elasticsearch.map.jinja index f7a39ee61..562982e6d 100644 --- a/salt/vars/elasticsearch.map.jinja +++ b/salt/vars/elasticsearch.map.jinja @@ -1,14 +1,14 @@ {% import 'vars/init.map.jinja' as INIT %} {% - set ELASTICSEARCH_GLOBALS = { 'elasticsearch': { - 'auth': INIT.PILLAR.elasticsearch.auth, 'es_cluster_name': INIT.PILLAR.elasticsearch.config.cluster.name, 'es_heap': INIT.PILLAR.elasticsearch.esheap } } - - %} + +{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %} +{% do ELASTICSEARCH_GLOBALS.elasticsearch.append({'auth': PILLAR.elasticsearch.auth}) %} +{% endif %}