move salt pillars to defaults

salt/common/tools/sbin/soup

@@ -160,7 +160,7 @@ upgrade_check() {
 }
 
 upgrade_check_salt() {
-    NEWSALTVERSION=$(grep version: $UPDATE_DIR/pillar/salt/master.sls | awk {'print $2'})
+    NEWSALTVERSION=$(grep version: $UPDATE_DIR/salt/salt/master.defaults.yaml | awk {'print $2'})
     if [ "$INSTALLEDSALTVERSION" == "$NEWSALTVERSION" ]; then
       echo "You are already running the correct version of Salt for Security Onion."
     else

salt/salt/master.defaults.yaml

@@ -0,0 +1,4 @@
+#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched
+salt:
+  master:
+    version: 3001

salt/salt/minion.defaults.yaml

@@ -0,0 +1,4 @@
+#version cannot be used elsewhere in this pillar as soup is grepping for it to determine if Salt needs to be patched
+salt:
+  minion:
+    version: 3001

salt/salt/minion.sls

@@ -1,5 +1,7 @@
 #Future state for Salt minions
-{% set saltversion = salt['pillar.get']('salt:minion:version') %}
+{% from 'salt/minion.defaults.yaml' import salt %}
+{% set saltversion = salt.salt.minion.version %}
+
 
 install_salt_minion:
   cmd.run: