From 41c59c7908cd728a74cfac10c03150020b4d8729 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Wed, 4 Apr 2018 18:38:54 +0200
Subject: [PATCH] Run with KVM if we can in tests

We should not Set nova_virt_type.
This way detection steps in, and kvm is used.

However, we should use qemu for OVH hosts:
There seem to be a bug in some OVH hosts
causing 'hardware error 0x0' when trying to run with kvm.

Change-Id: I4f679815ac55095000dc1017cebbd1a8bf0f6c5f
(cherry picked from commit 748e3d22925ff9cfe8baba087f37b26988f9e1e0)
---
 common-tasks/test-set-nodepool-vars.yml | 3 +++
 test-vars.yml                           | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common-tasks/test-set-nodepool-vars.yml b/common-tasks/test-set-nodepool-vars.yml
index 40197dc0..792f1c1d 100644
--- a/common-tasks/test-set-nodepool-vars.yml
+++ b/common-tasks/test-set-nodepool-vars.yml
@@ -29,6 +29,9 @@
         echo "opensuse_mirror=${NODEPOOL_OPENSUSE_MIRROR}"
         echo "pip_default_index=${NODEPOOL_PYPI_MIRROR}"
         echo "pip_wheel_mirror=${NODEPOOL_WHEEL_MIRROR}"
+        if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then
+          echo "nova_virt_type='qemu'"
+        fi
       args:
         executable: /bin/bash
       register: nodepool_variables
diff --git a/test-vars.yml b/test-vars.yml
index 93149eb1..dca2a94e 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -195,7 +195,6 @@ nova_service_user_domain_id: default
 nova_service_user_name: nova
 nova_venv_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"
 nova_venv_tag: "testing"
-nova_virt_type: qemu
 nova_discover_hosts_in_cells_interval: '-1'
 # lxd specific vars
 lxd_trust_password: "SuperSecrete"