From f8b77d0c9112aa97cc079bb718e530a1caa6d1ef Mon Sep 17 00:00:00 2001 From: Yao Lu Date: Wed, 18 Jan 2017 15:28:49 +0800 Subject: remove centos7.qcow2 every time before deploy,we need new centos7.qcow2. Change-Id: I295ed192674a31290b25042c0843875b93831ebc Signed-off-by: Yao Lu --- ci/deploy/deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ci') diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 59ed544b..1419642e 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -106,8 +106,8 @@ function clean_up echo "=====clean up all node and network======" clean_up all_in_one daisy2 clean_up daisy daisy1 -if [ -f $WORKDIR/daisy ]; then - rm -rf $WORKDIR +if [ -f $WORKDIR/daisy/centos7.qcow2 ]; then + rm -rf $WORKDIR/daisy/centos7.qcow2 fi echo "=======create daisy node================" @@ -154,6 +154,7 @@ echo "===========check install progress===========" execute_on_jumpserver $daisy_ip "systemctl restart daisy-api" execute_on_jumpserver $daisy_ip "systemctl restart daisy-registry" execute_on_jumpserver $daisy_ip "${REMOTE_SPACE}/deploy/check_os_progress.sh" +sleep 10 virsh reboot all_in_one execute_on_jumpserver $daisy_ip "${REMOTE_SPACE}/deploy/check_openstack_progress.sh" -- cgit 1.2.3-korg