commit 93d22d82988ee781feddf84535d65adf44472379
author Zuul <zuul@review.opendev.org> Mon Feb 17 01:05:14 2020 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 17 01:05:14 2020 +0000
tree 1f437a6920802f714a4d3d8019fd0de25fe9cf13
parent 80758e6932c79c48348730dfe571b9bcb02c5410
parent 8dd6f153d6b8dfd8ae976e7f1c9df06019a159b9

Merge "Add LIBVIRT_CPU_MODE to set CPU mode"

lib/nova

diff --git a/lib/nova b/lib/nova
index 7557a51..0893ed7 100644
--- a/lib/nova
+++ b/lib/nova
@@ -259,6 +259,7 @@
                 if [ ! -e /dev/kvm ]; then
                     echo "WARNING: Switching to QEMU"
                     LIBVIRT_TYPE=qemu
+                    LIBVIRT_CPU_MODE=none
                     if which selinuxenabled >/dev/null 2>&1 && selinuxenabled; then
                         # https://bugzilla.redhat.com/show_bug.cgi?id=753589
                         sudo setsebool virt_use_execmem on

lib/nova_plugins/hypervisor-libvirt

diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index 7d3ace8..d1b3d78 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -39,7 +39,7 @@
 function configure_nova_hypervisor {
     configure_libvirt
     iniset $NOVA_CONF libvirt virt_type "$LIBVIRT_TYPE"
-    iniset $NOVA_CONF libvirt cpu_mode "none"
+    iniset $NOVA_CONF libvirt cpu_mode "$LIBVIRT_CPU_MODE"
     # Do not enable USB tablet input devices to avoid QEMU CPU overhead.
     iniset $NOVA_CONF DEFAULT pointer_model "ps2mouse"
     iniset $NOVA_CONF libvirt live_migration_uri "qemu+ssh://$STACK_USER@%s/system"

stackrc

diff --git a/stackrc b/stackrc
index fa7a40f..e11a34c 100644
--- a/stackrc
+++ b/stackrc
@@ -621,6 +621,7 @@
 case "$VIRT_DRIVER" in
     ironic|libvirt)
         LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
+        LIBVIRT_CPU_MODE=${LIBVIRT_CPU_MODE:-none}
         if [[ "$os_VENDOR" =~ (Debian|Ubuntu) ]]; then
             # The groups change with newer libvirt. Older Ubuntu used
             # 'libvirtd', but now uses libvirt like Debian. Do a quick check