summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/run_salt.sh17
1 files changed, 1 insertions, 16 deletions
diff --git a/bootstrap/run_salt.sh b/bootstrap/run_salt.sh
index 3977e9c..3630405 100755
--- a/bootstrap/run_salt.sh
+++ b/bootstrap/run_salt.sh
@@ -9,26 +9,11 @@ salt_running_p() {
return ${?}
}
-python3_supported=$(python <<EOF
-try:
- from salt.scripts import salt_call
- print("success")
-except ImportError:
- print("fail")
-EOF
-)
-
-if [ "${python3_supported}" == "success" ]; then
- python=$(which python)
-else
- python=$(which python2)
-fi
-
while salt_running_p; do
sleep 5
done
-${python} $(which salt-call) \
+python $(which salt-call) \
--local \
--pillar-root=${working_dir}/pillar \
--file-root=${working_dir}/salt \