From 2fee151bff2c39c7e77a93bc08f24e8a8144662f Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 1 Sep 2020 10:43:21 -0400 Subject: [PATCH] resolve issue with salt state if os is redhat --- salt/salt/map.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index 5b882a3a3..5b9ea1c33 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -1,7 +1,7 @@ {% import_yaml 'salt/minion.defaults.yaml' as salt %} {% set SALTVERSION = salt.salt.minion.version %} -{% if grains.os|lower == 'ubuntu' %} +{% if grains.os|lower in ['ubuntu', 'redhat'] %} {% set COMMON = 'salt-common' %} {% elif grains.os|lower == 'centos' %} {% set COMMON = 'salt' %} @@ -10,7 +10,7 @@ {% if grains.saltversion|string != SALTVERSION|string %} {% if grains.os|lower == 'centos' %} {% set UPGRADECOMMAND = 'yum versionlock delete "salt-*" && sh /usr/sbin/bootstrap-salt.sh -F -x python3 stable ' ~ SALTVERSION %} - {% elif grains.os|lower == 'ubuntu' %} + {% elif grains.os|lower in ['ubuntu', 'redhat'] %} {% set UPGRADECOMMAND = 'apt-mark unhold salt-common && apt-mark unhold salt-minion && sh /usr/sbin/bootstrap-salt.sh -F -x python3 stable ' ~ SALTVERSION %} {% endif %} {% else %}