From e500e248020f16603221f9e85154247ebc183d10 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 24 Feb 2021 13:56:59 -0500 Subject: [PATCH] Only show log_size_limit warning on dist if heavynode pillars exist --- salt/common/tools/sbin/soup | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 7cdd0dd2c..1081ea6aa 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -127,10 +127,12 @@ check_log_size_limit() { num_minion_pillars=$(find /opt/so/saltstack/local/pillar/minions/ -type f | wc -l) if [[ $num_minion_pillars -gt 1 ]]; then - wait_for_enter=true - echo "[INFO] The value of log_size_limit in the minion pillars may be incorrect." - echo " -> We recommend checking and adjusting the values as necessary." - echo " -> Minion pillar directory: /opt/so/saltstack/local/pillar/minions/" + if find /opt/so/saltstack/local/pillar/minions/ -type f | grep -q "_heavynode"; then + wait_for_enter=true + echo "[INFO] The value of log_size_limit in any heavy node minion pillars may be incorrect." + echo " -> We recommend checking and adjusting the values as necessary." + echo " -> Minion pillar directory: /opt/so/saltstack/local/pillar/minions/" + fi else local minion_id minion_id=$(lookup_salt_value "id" "" "grains")