From 468567824ebdc6a64fb62be4962fd7d75e9c9a20 Mon Sep 17 00:00:00 2001 From: zhouya Date: Thu, 16 Mar 2017 09:36:20 +0800 Subject: distinguish virtual and bm deploy Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya --- ci/deploy/deploy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ci') diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index f81afe95..c14c9d8d 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===========" -- cgit 1.2.3-korg