remove references to 3003.1 change to 3003

salt/common/tools/sbin/soup

@@ -650,11 +650,6 @@ echo "Checking if Salt was upgraded."
 echo ""
 # Check that Salt was upgraded
 SALTVERSIONPOSTUPGRADE=$(salt --versions-report | grep Salt: | awk {'print $2'})
-if [[ "." =~ .*"$SALTVERSIONPOSTUPGRADE".* ]]; then
-  SALTVERSIONPOSTUPGRADE=$SALTVERSIONPOSTUPGRADE
-else
-  SALTVERSIONPOSTUPGRADE="${SALTVERSIONPOSTUPGRADE}.1"
-fi
 if [[ "$SALTVERSIONPOSTUPGRADE" != "$NEWSALTVERSION" ]]; then
   echo "Salt upgrade failed. Check of indicators of failure in $SOUP_LOG."
   echo "Once the issue is resolved, run soup again."

salt/salt/master.defaults.yaml

@@ -2,4 +2,4 @@
 # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions
 salt:
   master:
-    version: 3003.1
+    version: 3003

salt/salt/minion.defaults.yaml

@@ -2,5 +2,5 @@
 # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions
 salt:
   minion:
-    version: 3003.1
+    version: 3003
     check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default

salt/top.sls

@@ -17,6 +17,7 @@
 {% set ISAIRGAP = salt['pillar.get']('global:airgap', 'False') %}
 {% import_yaml 'salt/minion.defaults.yaml' as saltversion %}
 {% set saltversion = saltversion.salt.minion.version %}
+{% set INSTALLEDSALTVERSION = grains.saltversion %}
 
 base: