From d2dd68eb443ef02ba822091ef6b8649f92b38aa7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 1 Feb 2023 11:31:36 -0500 Subject: [PATCH] add global vars for managersearch --- salt/vars/managersearch.map.jinja | 15 +++++++++++++++ salt/vars/searchnode.map.jinja | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 salt/vars/managersearch.map.jinja diff --git a/salt/vars/managersearch.map.jinja b/salt/vars/managersearch.map.jinja new file mode 100644 index 000000000..c2a3d9628 --- /dev/null +++ b/salt/vars/managersearch.map.jinja @@ -0,0 +1,15 @@ +{% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %} +{% from 'vars/logstash.map.jinja' import LOGSTASH_GLOBALS %} + +{% set ROLE_GLOBALS = {} %} + +{% set MANAGERSEARCH_GLOBALS = + [ + ELASTICSEARCH_GLOBALS, + LOGSTASH_GLOBALS + ] +%} + +{% for sg in MANAGERSEARCH_GLOBALS %} +{% do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %} +{% endfor %} diff --git a/salt/vars/searchnode.map.jinja b/salt/vars/searchnode.map.jinja index 2efabefed..3b9d91bfc 100644 --- a/salt/vars/searchnode.map.jinja +++ b/salt/vars/searchnode.map.jinja @@ -3,13 +3,13 @@ {% set ROLE_GLOBALS = {} %} -{% set STANDALONE_GLOBALS = +{% set SEARCHNODE_GLOBALS = [ ELASTICSEARCH_GLOBALS, LOGSTASH_GLOBALS ] %} -{% for sg in STANDALONE_GLOBALS %} +{% for sg in SEARCHNODE_GLOBALS %} {% do salt['defaults.merge'](ROLE_GLOBALS, sg, merge_lists=False, in_place=True) %} {% endfor %}