From 9280dbb9d973128c35660e929e9966d0d417f104 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 19 Aug 2020 12:00:25 -0400 Subject: [PATCH] Update soup --- salt/common/tools/sbin/soup | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 53b7a2baa..f0d30e8fa 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -88,19 +88,24 @@ highstate() { } masterlock() { - TOPFILE=/opt/so/saltstack/default/salt/top.sls - BACKUPTOPFILE=/opt/so/saltstack/default/salt/top.sls.backup - mv -v $TOPFILE $BACKUPTOPFILE - echo "base:" > $TOPFILE - echo " $MINIONID:" >> $TOPFILE - echo " - ca" >> $TOPFILE - echo " - ssl" >> $TOPFILE - echo " - elasticsearch" >> $TOPFILE - + echo "Locking Salt Master" + if [[ "$INSTALLEDVERSION" =~ rc.1 ]]; then + TOPFILE=/opt/so/saltstack/default/salt/top.sls + BACKUPTOPFILE=/opt/so/saltstack/default/salt/top.sls.backup + mv -v $TOPFILE $BACKUPTOPFILE + echo "base:" > $TOPFILE + echo " $MINIONID:" >> $TOPFILE + echo " - ca" >> $TOPFILE + echo " - ssl" >> $TOPFILE + echo " - elasticsearch" >> $TOPFILE + fi } masterunlock() { - mv -v $BACKUPTOPFILE $TOPFILE + echo "Unlocking Salt Master" + if [[ "$INSTALLEDVERSION" =~ rc.1 ]]; then + mv -v $BACKUPTOPFILE $TOPFILE + fi } pillar_changes() { @@ -393,4 +398,4 @@ fi } -main "$@" | tee /dev/fd/3 \ No newline at end of file +main "$@" | tee /dev/fd/3