From 302e580d8f373c5dd2d19c037bcd770d44a9b3ca Mon Sep 17 00:00:00 2001 From: Wes Date: Wed, 31 May 2023 19:56:17 +0000 Subject: [PATCH] Add so-fleet role logic --- salt/elasticfleet/config.sls | 4 +++- salt/elasticfleet/enabled.sls | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/elasticfleet/config.sls b/salt/elasticfleet/config.sls index ec030ea1f..cc3b0675f 100644 --- a/salt/elasticfleet/config.sls +++ b/salt/elasticfleet/config.sls @@ -4,6 +4,7 @@ # Elastic License 2.0. {% from 'allowed_states.map.jinja' import allowed_states %} +{% from 'vars/globals.map.jinja' import GLOBALS %} {% if sls.split('.')[0] in allowed_states %} # Add EA Group @@ -51,6 +52,7 @@ eastatedir: - group: 939 - makedirs: True +{% if GLOBALS.role != "so-fleet" %} eaintegrationsdir: file.directory: - name: /opt/so/conf/elastic-fleet/integrations @@ -79,7 +81,7 @@ ea-integrations-load: - onchanges: - file: eaintegration - file: eadynamicintegration - +{% endif %} {% else %} {{sls}}_state_not_allowed: diff --git a/salt/elasticfleet/enabled.sls b/salt/elasticfleet/enabled.sls index bd09f4fe5..f388cb1c7 100644 --- a/salt/elasticfleet/enabled.sls +++ b/salt/elasticfleet/enabled.sls @@ -62,9 +62,11 @@ so-elastic-fleet: {% endif %} {% endif %} +{% if GLOBALS.role != "so-fleet" %} so-elastic-fleet-integrations: cmd.run: - name: /usr/sbin/so-elastic-fleet-integration-policy-load +{% endif %} delete_so-elastic-fleet_so-status.disabled: file.uncomment: