Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove idh.services from idh node pillar files #13013

Merged
merged 1 commit into from
May 15, 2024
Merged

remove idh.services from idh node pillar files #13013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions salt/manager/tools/sbin/so-minion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 7 additions & 1 deletion salt/manager/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading