From af3e4ceb7fa0fd65806993b3c2304e8d0f58b0c8 Mon Sep 17 00:00:00 2001
From: James Parker <jparker@redhat.com>
Date: Thu, 21 Oct 2021 09:12:29 -0400
Subject: [PATCH] Update cpu model for deployment

RHEL9/Centos9 switch to a new micro-architecture, updating the CPU model
of the deployment to avoid any issues with booting newer images.

Change-Id: I708360b722698a99b3743ce55b2eb2b62cefa547
---
 .zuul.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c5e90f5c..c0cf4e14 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -51,7 +51,7 @@
         LIBVIRT_TYPE: kvm
         TEMPEST_PLUGINS: /opt/stack/whitebox-tempest-plugin
         WHITEBOX_PRIVKEY_PATH: /home/tempest/.ssh/id_rsa
-        WHITEBOX_CPU_MODEL: kvm64
+        WHITEBOX_CPU_MODEL: Nehalem
         WHITEBOX_CPU_MODEL_EXTRA_FLAGS: vme,+ssse3,-mmx
         WHITEBOX_CPU_TOPOLOGY: "0: [0,1,2,3,4,5,6,7]"
       devstack_local_conf:
@@ -59,7 +59,7 @@
           $NOVA_CONF:
             libvirt:
               cpu_mode: custom
-              cpu_models: kvm64
+              cpu_models: Nehalem
               cpu_model_extra_flags: vme,+ssse3,-mmx
               virt_type: kvm
               rx_queue_size: 1024
@@ -73,7 +73,7 @@
             $NOVA_CONF:
               libvirt:
                 cpu_mode: custom
-                cpu_models: kvm64
+                cpu_models: Nehalem
                 cpu_model_extra_flags: vme,+ssse3,-mmx
                 virt_type: kvm
                 rx_queue_size: 1024