summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorzhouya <zhou.ya@zte.com.cn>2017-03-07 19:52:08 +0800
committerzhouya <zhou.ya@zte.com.cn>2017-03-08 10:26:40 +0800
commit21ead6d7d6357da3bcc14f416b99f49e1662c9cf (patch)
treefadbf75b92ab332a3bf294a9b368b56fe56962dc /ci
parentcea3fc95422cb550a156c365e046099e413e0563 (diff)
fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627
Change-Id: Ia018529ed3ca89e883a8ba2b1a693e2a5250af21 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 8c72a3cc..5fcea998 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -293,9 +293,11 @@ else
echo "daisy install successfully"
fi
-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' > /etc/kolla/config/nova/nova-compute.conf"
+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"
+fi
echo "===prepare cluster and pxe==="
ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --cluster 'yes'"