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>

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 8c72a3c..5fcea99 100755 (executable)
--- 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'"