diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 3a03a43d7..76e37c062 100755 --- a/salt/common/tools/sbin/soup +++ b/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 diff --git a/pillar/salt/master.sls b/salt/salt/master.defaults.yaml similarity index 100% rename from pillar/salt/master.sls rename to salt/salt/master.defaults.yaml diff --git a/pillar/salt/minion.sls b/salt/salt/minion.defaults.yaml similarity index 100% rename from pillar/salt/minion.sls rename to salt/salt/minion.defaults.yaml diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 3a00ae661..f2fd029a4 100644 --- a/salt/salt/minion.sls +++ b/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: