From cc71fd03f9cd7096361efecc8e1eed6b0862eed2 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Wed, 16 Oct 2019 14:52:57 +0100
Subject: [PATCH] CI: Don't set cpu mode

Not setting cpu-mode will reduce the number of TCG emulated features.
Hopefully this will make CI more reliable.

Change-Id: I24a8832c02db6ba019ab8f5c2b9d7216a9b7d213
---
 dev/tenks-deploy-config-compute.yml   | 3 +++
 dev/tenks-deploy-config-overcloud.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dev/tenks-deploy-config-compute.yml b/dev/tenks-deploy-config-compute.yml
index 0c3d4344b..fa84b1c4c 100644
--- a/dev/tenks-deploy-config-compute.yml
+++ b/dev/tenks-deploy-config-compute.yml
@@ -13,6 +13,9 @@ node_types:
     physical_networks:
       - physnet1
     console_log_enabled: true
+    # We seem to hit issues with missing cpu features in CI as a result of using host-model, e.g:
+    # https://zuul.opendev.org/t/openstack/build/02c33ab51664419a88a5a54ad22852a9/log/primary/system_logs/libvirt/qemu/tk0.txt.gz#38
+    cpu_mode:
 
 specs:
   - type: type0
diff --git a/dev/tenks-deploy-config-overcloud.yml b/dev/tenks-deploy-config-overcloud.yml
index 09ed6a170..9408ed41f 100644
--- a/dev/tenks-deploy-config-overcloud.yml
+++ b/dev/tenks-deploy-config-overcloud.yml
@@ -14,6 +14,9 @@ node_types:
     physical_networks:
       - physnet1
     console_log_enabled: true
+    # We seem to hit issues with missing cpu features in CI as a result of using host-model, e.g:
+    # https://zuul.opendev.org/t/openstack/build/02c33ab51664419a88a5a54ad22852a9/log/primary/system_logs/libvirt/qemu/tk0.txt.gz#38
+    cpu_mode:
 
 specs:
   - type: type0