only 3 attempts with 120s max attemps

This commit is contained in:
m0duspwnens
2021-10-13 12:34:56 -04:00
parent 880c1b97b0
commit a495779552

View File

@@ -2298,20 +2298,20 @@ salt_checkin() {
timeout=60 timeout=60
while ! (check_salt_master_status $timeout); do while ! (check_salt_master_status $timeout); do
echo "salt minion cannot talk to salt master after $timeout seconds" >> "$setup_log" 2>&1 echo "salt minion cannot talk to salt master after $timeout seconds" >> "$setup_log" 2>&1
if [ $count -gt 3 ]; then if [ $count -gt 2 ]; then
echo "salt minion could not talk to salt master after $count attempts, exiting" >> "$setup_log" 2>&1 echo "salt minion could not talk to salt master after $count attempts, exiting" >> "$setup_log" 2>&1
exit 1 exit 1
fi fi
sleep 1; sleep 1;
((count++)) ((count++))
((timeout+=20)) # add 20s to the timeout each attempt ((timeout+=30)) # add 20s to the timeout each attempt
done done
count=1 count=1
timeout=60 timeout=60
while ! (check_salt_minion_status $timeout) ; do while ! (check_salt_minion_status $timeout) ; do
echo "salt master did not get a job response from salt minion after $timeout seconds" >> "$setup_log" 2>&1 echo "salt master did not get a job response from salt minion after $timeout seconds" >> "$setup_log" 2>&1
if [ $count -gt 3 ]; then if [ $count -gt 2 ]; then
echo "salt master did not get a job response from salt minion after $count attempts, exiting" >> "$setup_log" 2>&1 echo "salt master did not get a job response from salt minion after $count attempts, exiting" >> "$setup_log" 2>&1
exit 1 exit 1
fi fi
@@ -2319,7 +2319,7 @@ salt_checkin() {
systemctl start salt-minion systemctl start salt-minion
sleep 1; sleep 1;
((count++)) ((count++))
((timeout+=20)) # add 20s to the timeout each attempt ((timeout+=30)) # add 20s to the timeout each attempt
done done
echo " Confirming existence of the CA certificate" echo " Confirming existence of the CA certificate"