From 1f8f1970661cb4d47d23499e53dd7bbfc1085008 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 2 Sep 2020 09:12:05 -0400
Subject: [PATCH] move redhat with centos

---
 salt/salt/map.jinja | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index 5b9ea1c33..89ceadd5b 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -1,16 +1,16 @@
 {% import_yaml 'salt/minion.defaults.yaml' as salt %}
 {% set SALTVERSION = salt.salt.minion.version %}
 
-{% if grains.os|lower in ['ubuntu', 'redhat'] %}
+{% if grains.os|lower == 'ubuntu' %}
   {% set COMMON = 'salt-common' %}
-{% elif grains.os|lower == 'centos' %}
+{% elif grains.os|lower in ['centos', 'redhat'] %}
   {% set COMMON = 'salt' %}
 {% endif %}
 
 {% if grains.saltversion|string != SALTVERSION|string %}
-  {% if grains.os|lower == 'centos' %}
+  {% if grains.os|lower in ['centos', 'redhat'] %}
     {% set UPGRADECOMMAND = 'yum versionlock delete "salt-*" && sh /usr/sbin/bootstrap-salt.sh -F -x python3 stable ' ~ SALTVERSION %}
-  {% elif grains.os|lower in ['ubuntu', 'redhat'] %}
+  {% elif grains.os|lower == 'ubuntu' %}
     {% 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 %}