From 6aa0d065c6d8f341a7307cf69e6afec2e2bdc682 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Thu, 2 Mar 2017 20:08:35 +0800 Subject: End deployment when timeout Change-Id: Iaae02bfc69450d6138b7b187ec23e4ed2eef6138 Signed-off-by: Alex Yang --- deploy/check_os_progress.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'deploy/check_os_progress.sh') diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh index abbd7e5a..c631a713 100755 --- a/deploy/check_os_progress.sh +++ b/deploy/check_os_progress.sh @@ -45,7 +45,15 @@ echo "run daisy install command" daisy install $cluster_id --skip-pxe-ipmi $skip echo "check os installing progress..." +maxcount=180 +count=0 while true; do + if [ $count -gt $maxcount ]; then + echo "It took too long to install the os, exit 1." + exit 1 + fi + count=$[count + 1] + os_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $8}' | grep -c "active" ` os_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $8}' | grep -c "install-failed" ` if [ $os_install_active -eq $hosts_num ]; then @@ -57,7 +65,7 @@ while true; do else progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $7}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'` echo "os in installing, the progress of each node is $progress%" - sleep 10 + sleep 30 fi done systemctl disable dhcpd -- cgit 1.2.3-korg