remove logic from fleet state to only run if in top

This commit is contained in:
m0duspwnens
2020-09-10 10:07:05 -04:00
parent 09cc8ae1fb
commit 0ed9c65646

View File

@@ -1,8 +1,3 @@
{% set show_top = salt['state.show_top']() %}
{% set top_states = show_top.values() | join(', ') %}
{% if 'fleet' in top_states %}
{%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%} {%- set MYSQLPASS = salt['pillar.get']('secrets:mysql', None) -%}
{%- set FLEETPASS = salt['pillar.get']('secrets:fleet', None) -%} {%- set FLEETPASS = salt['pillar.get']('secrets:fleet', None) -%}
{%- set FLEETJWT = salt['pillar.get']('secrets:fleet_jwt', None) -%} {%- set FLEETJWT = salt['pillar.get']('secrets:fleet_jwt', None) -%}
@@ -138,11 +133,3 @@ so-fleet:
- /opt/so/conf/fleet/etc - /opt/so/conf/fleet/etc
{% endif %} {% endif %}
{% else %}
fleet_state_not_allowed:
test.fail_without_changes:
- name: fleet_state_not_allowed
{% endif %}