From 4bf4634762791e852cbb50d42a6ddfcaad7bec3b Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 30 Jul 2020 13:47:21 -0400 Subject: [PATCH] ensure yum versionlock with a state rather than cmd.run state --- salt/salt/minion.sls | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 331efbc53..9dc34a810 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -1,18 +1,24 @@ include: - salt - + {% import_yaml 'salt/minion.defaults.yaml' as salt %} {% set saltversion = salt.salt.minion.version %} - +{% if grains.os|lower == 'centos' %} install_salt_minion: cmd.run: {% if grains.saltversion|string != saltversion|string %} - - name: yum versionlock delete "salt-*" && sh bootstrap-salt.sh -F -x python3 stable {{ saltversion }} && yum versionlock add "salt-*" + - name: yum versionlock delete "salt-*" && sh bootstrap-salt.sh -F -x python3 stable {{ saltversion }} {% else %} - name: echo 'Already running Salt Minon version {{ saltversion }}' {% endif %} +versionlock_salt_minion: + module.run: + - pkg.hold: + - name: "salt-*" +{% endif %} + salt_minion_service: service.running: - name: salt-minion