diff --git a/pillar/salt/master.sls b/pillar/salt/master.sls index 531f0ddb4..a34a96b9e 100644 --- a/pillar/salt/master.sls +++ b/pillar/salt/master.sls @@ -1,4 +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.1 \ No newline at end of file + version: 3001 \ No newline at end of file diff --git a/pillar/salt/minion.sls b/pillar/salt/minion.sls index 6abec03f5..4978a4a73 100644 --- a/pillar/salt/minion.sls +++ b/pillar/salt/minion.sls @@ -1,4 +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.1 \ No newline at end of file + version: 3001 \ No newline at end of file diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index d4ec9c0ab..1a7d947dd 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -225,11 +225,15 @@ upgrade_check_salt echo "Making pillar changes" pillar_changes echo "" -echo "Cleaning up old dockers" -clean_dockers -echo "" -echo "Updating docker to $NEWVERSION" -update_dockers + +if [ "$INSTALLEDVERSION" != "$NEWVERSION" ]; then + echo "Cleaning up old dockers" + clean_dockers + echo "" + echo "Updating docker to $NEWVERSION" + update_dockers +fi + echo "" echo "Copying new code" copy_new_files