summaryrefslogtreecommitdiffstats
path: root/ci/deploy
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-03-02 10:41:15 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-03-06 17:23:44 +0800
commitdd3335128617003db15e46378ed0baf7941c369c (patch)
tree4de08d45c43a2fcadbaec934e9bbb2ca7614ad1b /ci/deploy
parentfad85bb5ecb07240f909ad812bf58c194bc10453 (diff)
fix some bug of bm deploy
Change-Id: I96bed7259666d48a1fbc41bb9452d8493c4417b8 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'ci/deploy')
-rwxr-xr-xci/deploy/deploy.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index e7aba37b..aaa37259 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -257,8 +257,11 @@ function clean_up
echo "=====clean up all node and network======"
if [ $IS_BARE == 0 ];then
clean_up all_in_one daisy2
+ clean_up daisy daisy1
+else
+ virsh destroy daisy
+ virsh undefine daisy
fi
-clean_up daisy daisy1
if [ -f $WORKDIR/daisy/centos7.qcow2 ]; then
rm -rf $WORKDIR/daisy/centos7.qcow2
fi
@@ -269,7 +272,8 @@ if [ $IS_BARE == 0 ];then
create_node $daisy_server_net daisy1 $vmdeploy_daisy_server_vm daisy
else
$create_qcow2_path/daisy-img-modify.sh -c $create_qcow2_path/centos-img-modify.sh -a $DAISY_IP $PARAS_IMAGE
- create_node $bmdeploy_daisy_server_net daisy1 $bmdeploy_daisy_server_vm daisy
+ virsh define $bmdeploy_daisy_server_vm
+ virsh start daisy
fi
sleep 20
@@ -317,10 +321,6 @@ if [ $IS_BARE == 0 ];then
virsh start all_in_one
fi
-echo "============restart daisy service==========="
-ssh $SSH_PARAS $DAISY_IP "systemctl restart daisy-api"
-ssh $SSH_PARAS $DAISY_IP "systemctl restart daisy-registry"
-
echo "===========check install progress==========="
ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/deploy/check_os_progress.sh -d $IS_BARE -n $TARGET_HOSTS_NUM"
if [ $? -ne 0 ]; then