Get the right columns according to the upstream patch 23/33023/1
authorAlex Yang <yangyang1@zte.com.cn>
Thu, 6 Apr 2017 01:23:38 +0000 (09:23 +0800)
committerAlex Yang <yangyang1@zte.com.cn>
Thu, 6 Apr 2017 01:23:38 +0000 (09:23 +0800)
A column named 'Tecs_version_id' is added in the upstream patch
https://review.openstack.org/#/c/450056/.
So the column numbers of 'Role_progress' and 'Role_status' should
be modified in check_openstack_progress.sh

Change-Id: I47607bfe3ab89195569f785b3f815e57cee0406d
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
deploy/check_openstack_progress.sh

index 3512d6b..f0ab1e9 100755 (executable)
@@ -44,8 +44,9 @@ while true; do
     fi
     count=$[count + 1]
 
-    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" `
+    # get 'Role_status' column
+    openstack_install_active=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "active" `
+    openstack_install_failed=`daisy host-list --cluster-id $cluster_id | awk -F "|" '{print $13}' | grep -c "install-failed" `
     if [ $openstack_install_active -eq $hosts_num ]; then
         echo "openstack installing successful ..."
         break
@@ -54,7 +55,8 @@ while true; do
         tail -n 200 /var/log/daisy/kolla_$cluster_id*
         exit 1
     else
-        progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $11}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`
+        # get 'Role_progress' column
+        progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $12}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`
         echo " openstack in installing , progress of each node is $progress%"
         sleep 30
     fi