From ea253726a0ae6730e364067ebfa8f7cf854a18f0 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 15 May 2024 13:48:32 -0400 Subject: [PATCH 1/2] fix soup --- salt/manager/tools/sbin/soup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 0ac938188..0e4f5f8c8 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -439,8 +439,8 @@ 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 + 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 From 3a56058f7ff62c33d5c485d7a3934711fb632ef0 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 15 May 2024 15:31:31 -0400 Subject: [PATCH 2/2] update description --- salt/manager/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index df722e2ed..14d914df8 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -438,7 +438,7 @@ post_to_2.4.60() { } post_to_2.4.70() { - echo "Removing idh.services from IDH node pillar files" + 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"