diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index edd7aec85f..14d914df80 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -438,9 +438,9 @@ post_to_2.4.60() { } post_to_2.4.70() { - echo "Removing idh.services from IDH node pillar files" - for file in /opt/so/saltstack/local/pillar/minions/*_idh.sls; do - if [[ ! $file =~ "/opt/so/saltstack/local/pillar/minions/adv_" ]]; then + echo "Removing idh.services from any existing IDH node pillar files" + for file in /opt/so/saltstack/local/pillar/minions/*.sls; do + if [[ $file =~ "_idh.sls" && ! $file =~ "/opt/so/saltstack/local/pillar/minions/adv_" ]]; then echo "Removing idh.services from: $file" so-yaml.py remove "$file" idh.services fi