From 1e1d6a395d3c92e613503151cdb609abe9f1609f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 31 Jul 2020 13:25:37 -0400
Subject: [PATCH] cant get grains.filter_by to work for some reason

---
 salt/salt/map.jinja  | 9 +++++----
 salt/salt/minion.sls | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja
index 5730f0303..39c8a33a8 100644
--- a/salt/salt/map.jinja
+++ b/salt/salt/map.jinja
@@ -1,10 +1,11 @@
 {% import_yaml 'salt/minion.defaults.yaml' as salt %}
 {% set SALTVERSION = salt.salt.minion.version %}
 
-{% set SALTPACKAGES = salt['grains.filter_by']({
-    'Ubuntu': {'common': 'salt-common'},
-    'Centos': {'common': 'salt'},
-}) %}
+{% if grains.os|lower == 'ubuntu' %}
+  {% set COMMON = 'salt-common' %}
+{% elif grains.os|lower == 'centos' %}
+  {% set COMMON = 'salt' %}
+{% endif %}
 
 {% if grains.saltversion|string != SALTVERSION|string %}
   {% if grains.os|lower == 'centos' %}
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index a1311ebeb..b2d3a2913 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -1,4 +1,4 @@
-{% from 'salt/map.jinja' import SALTPACKAGES with context %}
+{% from 'salt/map.jinja' import COMMON with context %}
 {% from 'salt/map.jinja' import UPGRADECOMMAND with context %}
 
 include:
@@ -16,7 +16,7 @@ install_salt_minion:
 salt_minion_package:
   pkg.installed:
     - pkgs:
-      - {{ SALTPACKAGES.common }}
+      - {{ COMMON }}
       - salt-minion
     - hold: True