diff options
| author | ckonstanski <carlos.konstanski@olo.com> | 2021-11-21 20:28:13 -0700 |
|---|---|---|
| committer | ckonstanski <carlos.konstanski@olo.com> | 2021-11-21 20:28:13 -0700 |
| commit | 1694f0d9e0b6d65a46acff7a42c46313632a7d18 (patch) | |
| tree | a4ebaaac980afdbe3e8d3e8146881c2c21b3144c /bootstrap/run_salt.sh | |
| parent | ad819527bf8f0cc25e1c0c897020324e18395d94 (diff) | |
a bit of un-bitrotting
Diffstat (limited to 'bootstrap/run_salt.sh')
| -rwxr-xr-x | bootstrap/run_salt.sh | 17 |
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 \ |