diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index bc11da57b..fd1443a89 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -249,6 +249,7 @@ lookup_salt_value() { group=$2 kind=$3 output=${4:-newline_values_only} + local=$5 if [ -z "$kind" ]; then kind=pillar @@ -258,7 +259,11 @@ lookup_salt_value() { group=${group}: fi - salt-call --no-color ${kind}.get ${group}${key} --out=${output} + if [[ "$local" != "--local" ]] || [[ "$local" != "local" ]] + local="" + fi + + salt-call --no-color ${kind}.get ${group}${key} --out=${output} ${local} } lookup_pillar() { diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index f43948fb3..223181f73 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -255,7 +255,7 @@ check_log_size_limit() { fi else local minion_id - minion_id=$(lookup_salt_value "id" "" "grains") + minion_id=$(lookup_salt_value "id" "" "grains" "local") local minion_arr IFS='_' read -ra minion_arr <<< "$minion_id"