From fe46e583d21334d164ca384ebef6691ef917f3bd Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 14 Feb 2023 11:04:14 +0100 Subject: [PATCH] CI: Use libvirt/cpu_models instead of cpu_model cpu_model is deprecated Change-Id: If30fb6aec745a48c42a2f281f726a869017ba9b9 --- tests/templates/nova-compute-overrides.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/templates/nova-compute-overrides.j2 b/tests/templates/nova-compute-overrides.j2 index 6d52544622..ea62a697f5 100644 --- a/tests/templates/nova-compute-overrides.j2 +++ b/tests/templates/nova-compute-overrides.j2 @@ -1,15 +1,15 @@ [libvirt] {% if ansible_architecture == 'aarch64' %} -cpu_mode=custom +cpu_mode = custom # cpu_model=max fails to boot multiple images with QEMU 7.0 and -M virt (works with "-M virt-6.2") -cpu_model=cortex-a72 +cpu_models = cortex-a72 {% elif ansible_architecture == 'x86_64' %} # RHEL 9 are being compiled for the x86_64-v2 architecture which is # newer than the qemu default of qemu64. Nehalem is apparently the # oldest model that works for x86_64-v2 and is expected to work on # Intel and AMD cpus with kvm or qemu. {% if virt_type == 'kvm' %} -cpu_mode=custom -cpu_model=Nehalem +cpu_mode = custom +cpu_models = Nehalem {% endif %} {% endif %}