From dd3335128617003db15e46378ed0baf7941c369c Mon Sep 17 00:00:00 2001 From: zhouya Date: Thu, 2 Mar 2017 10:41:15 +0800 Subject: fix some bug of bm deploy Change-Id: I96bed7259666d48a1fbc41bb9452d8493c4417b8 Signed-off-by: zhouya --- deploy/check_openstack_progress.sh | 4 ++-- deploy/check_os_progress.sh | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'deploy') diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh index bbd631b6..e50eb332 100755 --- a/deploy/check_openstack_progress.sh +++ b/deploy/check_openstack_progress.sh @@ -23,8 +23,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` - echo " openstack in installing , progress is $progress%" + 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'` + echo " openstack in installing , progress of each node is $progress%" sleep 30 fi done diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh index c631a713..b7b05700 100755 --- a/deploy/check_os_progress.sh +++ b/deploy/check_os_progress.sh @@ -36,10 +36,17 @@ done source /root/daisyrc_admin cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p'` +hosts_id=`daisy host-list | awk -F "|" '{print $2}'| grep -o "[^ ]\+\( \+[^ ]\+\)*"|tail -n +2` skip=false if [ $deploy_env == 0 ];then skip=true + for host_id in $hosts_id; + do + echo "update host $host_id ipmi user and passwd" + daisy host-update $host_id --ipmi-user zteroot --ipmi-passwd superuser + done fi +echo "update all hosts ipmi user and passwd ok!" echo "run daisy install command" daisy install $cluster_id --skip-pxe-ipmi $skip -- cgit 1.2.3-korg