xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-22 20:31:09 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT/postscripts/documulusdiscovery

Browse Source
This commit is contained in:
GONG Jie
2017-12-31 23:59:59 +00:00
parent 62430b1404
commit d9919e4da1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT/postscripts/documulusdiscovery
View File

@@ -1,6 +1,6 @@
#!/bin/bash
#this script grabs the switch information, then composes a "findme" request and sends it to MN
#so that the switch can be discovered
#so that the switch can be discovered
# TODO: Figure out the master based on the DHCP packet
XCATMASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases |grep cumulus-provision-url|tail -1|awk -F/ '{print $3}')
@@ -112,20 +112,20 @@ while [ $RETRY -lt $MAX_RETRY ]; do
if grep "restart" /tmp/result.socat.out; then
DISCOVERED=1
break;
elif grep "processing" /tmp/result.socat.out; then
elif grep "processing" /tmp/result.socat.out; then
echo "My findme request is still under processing, do not send new request"
logger -s -t $log_label -p local4.info "My findme request is still under processing, do not send new request"
sleep 6
elif grep "processed" /tmp/result.socat.out; then
echo "Fail to discover me, retry to send findme request 900 seconds later!"
logger -s -t $log_label -p local4.info "Fail to discover me, retry to send findme request 900 seconds later"
sleep 900
sleep 900
break;
else
echo "no response from $XCATMASTER, wait for 6 seconds"
logger -s -t $log_label -p local4.info "no response from $XCATMASTER, wait for 6 seconds"
sleep 6
fi
fi
fi
((WAITRETRY=WAITRETRY+1))
done
@@ -133,7 +133,7 @@ while [ $RETRY -lt $MAX_RETRY ]; do
if [ "$DISCOVERED" = "1" ]; then
break
fi
((RETRY=RETRY+1))
done