diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-03-11 23:52:14 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2017-03-11 23:52:14 +0800 |
| commit | c557362eb2a14055587feac228a4463bd96f6f4a (patch) | |
| tree | 0070ca8412fc00532bd0e86df74f1a3df11ca4d1 | |
| parent | 07eaa746cd8dd0a02a1d5f27e366ec389d3e1f93 (diff) | |
remove blanks from cluster_id
There are blanks at the head and the tail of $cluster_id. Then in
https://build.opnfv.org/ci/job/daisy-deploy-virtual-daily-master/26/console
there are error messages as "No such file or directory".
Change-Id: Ia5d119df85d4f64fbc3a47705ccc208d7a67b2de
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
| -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 |