diff options
| -rwxr-xr-x | deploy/check_openstack_progress.sh | 2 | ||||
| -rwxr-xr-x | deploy/check_os_progress.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh index e50eb332..f4baff1e 100755 --- a/deploy/check_openstack_progress.sh +++ b/deploy/check_openstack_progress.sh @@ -1,7 +1,7 @@ #!/bin/bash source /root/daisyrc_admin echo "check openstack installing progress..." -cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p'` +cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p' | tr -d " "` maxcount=180 count=0 diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh index 30226844..f76af9b6 100755 --- a/deploy/check_os_progress.sh +++ b/deploy/check_os_progress.sh @@ -35,7 +35,7 @@ do done source /root/daisyrc_admin -cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p'` +cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p' | tr -d " "` hosts_id=`daisy host-list | awk -F "|" '{print $2}'| grep -o "[^ ]\+\( \+[^ ]\+\)*"|tail -n +2` skip=false if [ $deploy_env == 0 ];then |