diff options
Diffstat (limited to 'ci/deploy')
| -rwxr-xr-x | ci/deploy/deploy.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index f81afe95..9fca1220 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -314,12 +314,14 @@ else fi echo "======prepare host and pxe===========" -ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --host 'yes' --env $IS_BARE" +ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --host 'yes' --isbare $IS_BARE" -echo "======daisy deploy os and openstack===========" +echo "======daisy virtual-deploy os and openstack===========" if [ $IS_BARE == 0 ];then virsh destroy all_in_one virsh start all_in_one + sleep 20 + ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --install 'yes'" fi echo "===========check install progress===========" @@ -340,9 +342,11 @@ fi if [ $IS_BARE == 0 ];then echo "============post deploy=====================" - ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/post/execute.py" + ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK" fi +echo "============deploy success===================" + exit 0 # |