From 0e1e9ff343bdfb5165b5f6ebe827202ac889a658 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 9 Jan 2023 11:15:29 -0500 Subject: [PATCH] Changes to accept minion --- salt/common/tools/sbin/so-minion | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion index 609ce184a..4d2d20b9a 100755 --- a/salt/common/tools/sbin/so-minion +++ b/salt/common/tools/sbin/so-minion @@ -201,7 +201,7 @@ function createIDHNODE() { } function testConnection() { - retry 5 10 "salt '$MINION_ID' test.ping" 0 + retry 15 3 "salt '$MINION_ID' test.ping" 0 local ret=$? if [[ $ret != 0 ]]; then echo "The Minion has been accepted but is not online. Try again later" @@ -225,9 +225,7 @@ if [[ "$OPERATION" = 'add' || "$OPERATION" = 'setup' ]]; then if [ $OPERATION != 'setup' ]; then # Accept the salt key acceptminion - # Let the keys echange - sleep 3 - # Need logic here to try and salt ping.. If it doesn't work need to do something + # Test to see if the minion was accepted testConnection # Pull the info from the file to build what is needed getinstallinfo