summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-04-06 09:23:38 +0800
committerAlex Yang <yangyang1@zte.com.cn>2017-04-06 09:23:38 +0800
commitdcb206d2d954f95ace1c93febf8ce9d38270facd (patch)
treea0f3d601337a0e16be90230bb066440f2030f5f3 /deploy
parenteb479eb3ec9ec756ac1f1eb194f9831394f6e27c (diff)
Get the right columns according to the upstream patch
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>
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/check_openstack_progress.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index 3512d6bc..f0ab1e90 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -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