diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-03-07 01:43:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-07 01:43:41 +0000 |
| commit | 7c3c3d2a629f5bf5373d21780963a143d45e6067 (patch) | |
| tree | d6e0ff4b16ff8ca04271ea2312bdcdef91fa14b2 /ci | |
| parent | d222c03bc58c79d918001773639d0f81a57c86a8 (diff) | |
| parent | dd3335128617003db15e46378ed0baf7941c369c (diff) | |
Merge "fix some bug of bm deploy"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy/deploy.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 8c13776c..8c72a3cc 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 |