From 51862e580386f505ddd935a7cb08d9306a0864f7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 14 May 2024 13:08:51 -0400 Subject: [PATCH] remove idh.services from idh node pillar files --- salt/manager/tools/sbin/so-minion | 6 +----- salt/manager/tools/sbin/soup | 8 +++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion index e0e892c3d..8b563ef1d 100755 --- a/salt/manager/tools/sbin/so-minion +++ b/salt/manager/tools/sbin/so-minion @@ -201,11 +201,7 @@ function add_idh_to_minion() { "idh:"\ " enabled: True"\ " restrict_management_ip: $IDH_MGTRESTRICT"\ - " services:" >> "$PILLARFILE" - IFS=',' read -ra IDH_SERVICES_ARRAY <<< "$IDH_SERVICES" - for service in ${IDH_SERVICES_ARRAY[@]}; do - echo " - $service" | tr '[:upper:]' '[:lower:]' | tr -d '"' >> "$PILLARFILE" - done + " " >> $PILLARFILE } function add_logstash_to_minion() { diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 39cd07071..0ac938188 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -438,7 +438,13 @@ post_to_2.4.60() { } post_to_2.4.70() { - echo "Nothing to apply" + 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: $file" + so-yaml.py remove "$file" idh.services + fi + done POSTVERSION=2.4.70 }