diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-03-09 06:33:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-09 06:33:07 +0000 |
| commit | e9990329cf7a9bf9978dad9587f5a2026214cbfa (patch) | |
| tree | 1a2a8226838e6533ca253c185c8815129e879afd | |
| parent | 70fbd81292bd0a514e3a0add4a84bb6f425bc5e2 (diff) | |
| parent | 21ead6d7d6357da3bcc14f416b99f49e1662c9cf (diff) | |
Merge "fix libvirt bug of https://bugzilla.redhat.com/show_bug.cgi?id=1404627"
| -rwxr-xr-x | ci/deploy/deploy.sh | 8 |
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'" |