From a46f3e8c4ef7e09deb3d5dc2d1e6969b6375b905 Mon Sep 17 00:00:00 2001
From: zhouya <zhou.ya@zte.com.cn>
Date: Tue, 14 Mar 2017 14:59:35 +0800
Subject: modify daisy install interface and modify check_openstack_progress
 targetnode nums

Change-Id: I19f8c18f8b977619c9bbf6f1e80f7c48f8f5db9e
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
---
 deploy/check_openstack_progress.sh | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'deploy/check_openstack_progress.sh')

diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index f4baff1e..3512d6bc 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -1,4 +1,35 @@
 #!/bin/bash
+usage()
+{
+    cat << EOF
+USAGE: `basename $0`  [-n hosts_num]
+
+OPTIONS:
+  -n target node numbers
+
+EXAMPLE:
+    sudo `basename $0` -d 1 -n 5
+EOF
+}
+
+while getopts "n:h" OPTION
+do
+    case $OPTION in
+        n)
+            hosts_num=${OPTARG}
+            ;;
+        h)
+            usage
+            exit 0
+            ;;
+        *)
+            echo "${OPTION} is not a valid argument"
+            usage
+            exit 0
+            ;;
+    esac
+done
+
 source /root/daisyrc_admin
 echo "check openstack installing progress..."
 cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p' | tr -d " "`
@@ -15,7 +46,7 @@ while true; do
 
     openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $12}' | grep -c "active" `
     openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $12}' | grep -c "install-failed" `
-    if [ $openstack_install_active -eq 1 ]; then
+    if [ $openstack_install_active -eq $hosts_num ]; then
         echo "openstack installing successful ..."
         break
     elif [ $openstack_install_failed -gt 0 ]; then
-- 
cgit 1.2.3-korg