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>

diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index e50eb33..f4baff1 100755 (executable)
--- 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 3022684..f76af9b 100755 (executable)
--- 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