From 416da1f522753fefe2559e6224cb0c50cb177fe5 Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Tue, 7 Feb 2023 11:43:27 +0100
Subject: [PATCH] set cpu_model to Nehalem for kvm jobs

RHEL 9 and Ubuntu Jammy 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.

See devstack change [0].

[0]: Ibd6e11b59f3c8655bc60ace7383a08458b2177f2

Depends-on: https://review.opendev.org/c/openstack/kayobe/+/872981

Change-Id: I09567b4cce95ff1fe2fe4e9e91e49d5f5082f7d0
---
 etc/kayobe/kolla/config/nova/nova-compute.conf | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 etc/kayobe/kolla/config/nova/nova-compute.conf

diff --git a/etc/kayobe/kolla/config/nova/nova-compute.conf b/etc/kayobe/kolla/config/nova/nova-compute.conf
new file mode 100644
index 0000000..ebaf4fc
--- /dev/null
+++ b/etc/kayobe/kolla/config/nova/nova-compute.conf
@@ -0,0 +1,11 @@
+{% raw %}
+[libvirt]
+# RHEL 9 and Ubuntu Jammy 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 nova_compute_virt_type == 'kvm' %}
+cpu_mode=custom
+cpu_model=Nehalem
+{% endif %}
+{% endraw %}