summaryrefslogtreecommitdiffstats
path: root/ci/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'ci/deploy')
-rwxr-xr-xci/deploy/deploy.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index be17dfa7..6c88dc5a 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -269,7 +269,10 @@ else
virsh define $BMDEPLOY_DAISY_SERVER_VM
virsh start daisy
fi
-sleep 20
+#wait for the daisy1 network start finished for execute trustme.sh
+#here sleep 40 just needed in Dell blade server
+#for E9000 blade server we only have to sleep 20
+sleep 40
echo "====== install daisy ======"
$DEPLOY_PATH/trustme.sh $DAISY_IP $DAISY_PASSWD
@@ -293,8 +296,6 @@ scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/
if [ $IS_BARE == 0 ];then
echo "====== add relate config of kolla ======"
- ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova"
- ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf"
ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK"
fi