From ba5b5db2c4e8bb10b60cf8f08a4b54a3262edb93 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 21 Jun 2021 08:56:24 -0400 Subject: [PATCH] remove the salt-minion check for schedules --- salt/patch/os/schedule.sls | 2 -- salt/salt/minion-check.sls | 2 -- salt/schedule.sls | 2 -- 3 files changed, 6 deletions(-) diff --git a/salt/patch/os/schedule.sls b/salt/patch/os/schedule.sls index 4e7820de1..4ad9a454e 100644 --- a/salt/patch/os/schedule.sls +++ b/salt/patch/os/schedule.sls @@ -1,5 +1,4 @@ {% if salt['pillar.get']('patch:os:schedule_name') %} - {% if salt['service.status']('salt-minion', True) %} {% set patch_os_pillar = salt['pillar.get']('patch:os') %} {% set schedule_name = patch_os_pillar.schedule_name %} {% set splay = patch_os_pillar.get('splay', 300) %} @@ -63,7 +62,6 @@ remove_patch_os_schedule: {% endif %} - {% endif %} {% else %} no_patch_os_schedule_name_set: diff --git a/salt/salt/minion-check.sls b/salt/salt/minion-check.sls index a9d2e8d8d..66ab732e2 100644 --- a/salt/salt/minion-check.sls +++ b/salt/salt/minion-check.sls @@ -1,7 +1,6 @@ include: - salt.minion-state-apply-test -{% if salt['service.status']('salt-minion', True) %} state-apply-test: schedule.present: - name: salt-minion-state-apply-test @@ -18,4 +17,3 @@ state-apply-test: - identifier: so-salt-minion-check - user: root - minute: '*/5' -{% endif %} diff --git a/salt/schedule.sls b/salt/schedule.sls index 30b5f8608..12e1cd081 100644 --- a/salt/schedule.sls +++ b/salt/schedule.sls @@ -1,7 +1,5 @@ -{% if salt['service.status']('salt-minion', True) %} schedule: schedule.present: - function: state.highstate - minutes: 15 - maxrunning: 1 -{% endif %}