summaryrefslogtreecommitdiff
path: root/bootstrap/run_salt.sh
diff options
context:
space:
mode:
authorckonstanski <carlos.konstanski@olo.com>2023-12-19 21:40:43 -0700
committerckonstanski <carlos.konstanski@olo.com>2023-12-19 21:40:43 -0700
commit768c5f296b0c5ff5f22ead03642db5dca194089f (patch)
treede8fe49bff957b36a7751b344c0ce0e2cf02742b /bootstrap/run_salt.sh
parent6b24c8845b9ce027d96732c6281183f69186d204 (diff)
salt in a virtualenvHEADmaster
Diffstat (limited to 'bootstrap/run_salt.sh')
-rwxr-xr-xbootstrap/run_salt.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/bootstrap/run_salt.sh b/bootstrap/run_salt.sh
index d36e5d5..f8eaa02 100755
--- a/bootstrap/run_salt.sh
+++ b/bootstrap/run_salt.sh
@@ -1,8 +1,9 @@
#!/bin/bash -e
-working_dir="${1}"
-build_basedir="${2}"
-local_build="${3:-false}"
+salt_bin="${1}"
+working_dir="${2}"
+build_basedir="${3}"
+local_build="${4:-false}"
salt_running_p() {
ps -ef | grep -F "salt-call" | grep -v "grep"
@@ -13,7 +14,7 @@ while salt_running_p; do
sleep 5
done
-salt-call \
+${salt_bin}/salt-call \
--local \
--pillar-root=${working_dir}/pillar \
--file-root=${working_dir}/salt \