From d4f72b03021aeae33caf482efe477c5b8bf83763 Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Tue, 13 Dec 2016 13:53:41 -0500 Subject: [PATCH] Default libvirt_cpu_mode to none when using qemu An upcoming update to qemu-kvm (2.6.0) with CentOS/RHEL 7.3 can break existing implementations where qemu is the configured hypervisor and 'host-model' is used. As such, ensure libvirt_cpu_mode is set to none when qemu is in use. Worth noting that devstack has been setting 'none' [1] as well. [1]: https://github.com/openstack-dev/devstack/blob/1c442eebc8fe005af453bd610e750a1919a2b3ed/lib/nova_plugins/hypervisor-libvirt#L42 Change-Id: I4a7c3ced59c46fb2582122260922813b09a3d042 --- test-environments/multinode.yaml | 2 ++ test-environments/worker-config-mitaka-and-below.yaml | 3 +++ test-environments/worker-config.yaml | 3 +++ 3 files changed, 8 insertions(+) diff --git a/test-environments/multinode.yaml b/test-environments/multinode.yaml index 5dd7a3a43..6d76047c7 100644 --- a/test-environments/multinode.yaml +++ b/test-environments/multinode.yaml @@ -42,3 +42,5 @@ parameter_defaults: ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu + # Required for Centos 7.3 and Qemu 2.6.0 + nova::compute::libvirt::libvirt_cpu_mode: 'none' diff --git a/test-environments/worker-config-mitaka-and-below.yaml b/test-environments/worker-config-mitaka-and-below.yaml index 1a891a82e..83bbfbaf2 100644 --- a/test-environments/worker-config-mitaka-and-below.yaml +++ b/test-environments/worker-config-mitaka-and-below.yaml @@ -14,3 +14,6 @@ parameter_defaults: NeutronWorkers: 1 NovaWorkers: 1 SwiftWorkers: 1 + NovaComputeExtraConfig: + # Required for Centos 7.3 and Qemu 2.6.0 + nova::compute::libvirt::libvirt_cpu_mode: 'none' diff --git a/test-environments/worker-config.yaml b/test-environments/worker-config.yaml index cb5a59375..67bceea96 100644 --- a/test-environments/worker-config.yaml +++ b/test-environments/worker-config.yaml @@ -5,3 +5,6 @@ parameter_defaults: heat::api_cloudwatch::enabled: false heat::api_cfn::enabled: false heat::rpc_response_timeout: 600 + NovaComputeExtraConfig: + # Required for Centos 7.3 and Qemu 2.6.0 + nova::compute::libvirt::libvirt_cpu_mode: 'none'