diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index d59cb8ccb..72fda32aa 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -957,9 +957,9 @@ upgrade_salt() { if [[ $is_rpm ]]; then echo "Removing yum versionlock for Salt." echo "" - yum versionlock delete "salt-0:$INSTALLEDSALTVERSION-0.*" - yum versionlock delete "salt-minion-0:$INSTALLEDSALTVERSION-0.*" - yum versionlock delete "salt-master-0:$INSTALLEDSALTVERSION-0.*" + yum versionlock delete "salt" + yum versionlock delete "salt-minion" + yum versionlock delete "salt-master" echo "Updating Salt packages." echo "" set +e diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 1a14f7419..a5953e8e1 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -23,7 +23,7 @@ unhold_salt_packages: pkg.unheld: - pkgs: {% for package in SALTPACKAGES %} - - {{ package }}: {{INSTALLEDSALTVERSION}}-0.* + - {{ package }} {% endfor %} install_salt_minion: