From 27e18daea798cdfdcfaabc9342e2b996644f0386 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Thu, 21 Jun 2018 17:22:50 +0800
Subject: [PATCH] Add cpu_mode in nova.conf

With libvirt 2.0, when using qemu cpu mode is not properly
evaluated and need to be set to cpu_mode = none.

Add this option when kvm is not supported, otherwise user
will still facing errors when launching instances over qemu.

Change-Id: Ib00fa257fb33fd3281f484a47a945640da8dda56
---
 doc/source/install/ext-dns-fqdn.rst                       | 1 +
 tools/deployment/armada/multinode/armada-osh.yaml         | 1 +
 tools/deployment/developer/ceph/160-compute-kit.sh        | 1 +
 tools/deployment/developer/nfs/160-compute-kit.sh         | 1 +
 tools/deployment/multinode/140-compute-kit.sh             | 1 +
 tools/overrides/backends/networking/compute-kit-sr-iov.sh | 1 +
 6 files changed, 6 insertions(+)

diff --git a/doc/source/install/ext-dns-fqdn.rst b/doc/source/install/ext-dns-fqdn.rst
index 7c6d710384..a71e246ddb 100644
--- a/doc/source/install/ext-dns-fqdn.rst
+++ b/doc/source/install/ext-dns-fqdn.rst
@@ -171,6 +171,7 @@ all the ``--set`` flags
   helm install --name=nova local/nova --namespace=openstack \
     --values=./tools/overrides/mvp/nova.yaml \
     --set conf.nova.libvirt.virt_type=qemu \
+    --set conf.nova.libvirt.cpu_mode=none \
     --set endpoints.compute.host_fqdn_override.public=nova.$FQDN \
     --set endpoints.compute_metadata.host_fqdn_override.public=metadata.$FQDN \
     --set endpoints.image.host_fqdn_override.public=glance.$FQDN \
diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml
index e44c9f807b..bce28e3e20 100644
--- a/tools/deployment/armada/multinode/armada-osh.yaml
+++ b/tools/deployment/armada/multinode/armada-osh.yaml
@@ -931,6 +931,7 @@ data:
       nova:
         libvirt:
           virt_type: qemu
+          cpu_mode: none
   source:
     type: local
     location: ${OSH_PATH}
diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh
index cba3516820..bab31ae1c2 100755
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -32,6 +32,7 @@ else
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set conf.nova.libvirt.virt_type=qemu \
+      --set conf.nova.libvirt.cpu_mode=none \
       ${OSH_EXTRA_HELM_ARGS} \
       ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh
index 7a1fc028da..516fc562dc 100755
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -34,6 +34,7 @@ else
       --namespace=openstack \
       --set conf.ceph.enabled=false \
       --set conf.nova.libvirt.virt_type=qemu \
+      --set conf.nova.libvirt.cpu_mode=none \
       ${OSH_EXTRA_HELM_ARGS} \
       ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh
index edc175a9ee..12b0815ef7 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -44,6 +44,7 @@ else
       --namespace=openstack \
       --values=/tmp/nova.yaml \
       --set conf.nova.libvirt.virt_type=qemu \
+      --set conf.nova.libvirt.cpu_mode=none \
       ${OSH_EXTRA_HELM_ARGS} \
       ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
diff --git a/tools/overrides/backends/networking/compute-kit-sr-iov.sh b/tools/overrides/backends/networking/compute-kit-sr-iov.sh
index f6555bfe21..050d290216 100755
--- a/tools/overrides/backends/networking/compute-kit-sr-iov.sh
+++ b/tools/overrides/backends/networking/compute-kit-sr-iov.sh
@@ -61,6 +61,7 @@ else
   helm upgrade --install nova ./nova \
       --namespace=openstack \
       --set conf.nova.libvirt.virt_type=qemu \
+      --set conf.nova.libvirt.cpu_mode=none \
       --values /tmp/nova.yaml \
       ${OSH_EXTRA_HELM_ARGS}
 fi