From cc66daba1af3a8bb638ccbccca2d2bf3e7c3ea31 Mon Sep 17 00:00:00 2001 From: weslambert Date: Thu, 11 Jan 2024 14:49:39 -0500 Subject: [PATCH] Make sure optional integration pillar values are merged with defaults --- salt/elasticfleet/config.sls | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/elasticfleet/config.sls b/salt/elasticfleet/config.sls index 5d5d3e826..53d838c7c 100644 --- a/salt/elasticfleet/config.sls +++ b/salt/elasticfleet/config.sls @@ -4,7 +4,7 @@ # Elastic License 2.0. {% from 'allowed_states.map.jinja' import allowed_states %} -{% from 'vars/globals.map.jinja' import GLOBALS %} +{% from 'vars/globals.map.jinja' import GLOBALS % {% if sls.split('.')[0] in allowed_states %} {% set node_data = salt['pillar.get']('node_data') %} @@ -104,8 +104,9 @@ eaoptionalintegrationsdir: {% for minion in node_data %} {% set role = node_data[minion]["role"] %} {% if role in [ "eval","fleet","heavynode","import","manager","managersearch","standalone" ] %} -{% set optional_integrations = salt['pillar.get']('elasticfleet:optional_integrations', {}) %} -{% set integration_keys = salt['pillar.get']('elasticfleet:optional_integrations', {}).keys() %} +{% from 'elasticfleet/map.jinja' import ELASTICFLEETMERGED %} +{% set optional_integrations = ELASTICFLEETMERGED.optional_integrations %} +{% set integration_keys = optional_integrations.keys() %} fleet_server_integrations_{{ minion }}: file.directory: - name: /opt/so/conf/elastic-fleet/integrations-optional/FleetServer_{{ minion }}