summaryrefslogtreecommitdiffstats
path: root/ci/deploy
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-03-16 09:36:20 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-03-17 17:39:54 +0800
commit468567824ebdc6a64fb62be4962fd7d75e9c9a20 (patch)
treebd15a0232bb2d4736c099ba70b76326f6439f1ac /ci/deploy
parente4485f2bb507a77012e4d21bd63357ef04b1d204 (diff)
distinguish virtual and bm deploy
Change-Id: I9fcc4f08283c832d32c22c2195401dd86ecf9dc5 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'ci/deploy')
-rwxr-xr-xci/deploy/deploy.sh6
1 files changed, 4 insertions, 2 deletions
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==========="