From 0c72e265f16f95745e447ca8ac8aa6b591be3a06 Mon Sep 17 00:00:00 2001
From: Benjamin Michael Cooper <bcooper@cray.com>
Date: Tue, 4 Jul 2017 11:02:35 +0100
Subject: [PATCH] Configurable virtualisation

Allows qemu to be specified instead of kvm when hardware
virtualisation is not available.

Change-Id: Ib220c344f4cecc665930d51aa56c7fbfe749b7ac
---
 bareon/tests_functional/node_templates/data_retention.xml       | 2 +-
 .../node_templates/data_retention_blank_primary.xml             | 2 +-
 .../node_templates/data_retention_with_unlabelled_disk.xml      | 2 +-
 bareon/tests_functional/node_templates/one_disk.xml             | 2 +-
 bareon/tests_functional/node_templates/one_disk_persistent.xml  | 2 +-
 bareon/tests_functional/node_templates/two_disks.xml            | 2 +-
 bareon/tests_functional/node_templates/two_disks_multiboot.xml  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bareon/tests_functional/node_templates/data_retention.xml b/bareon/tests_functional/node_templates/data_retention.xml
index 1439641..b3b09a1 100644
--- a/bareon/tests_functional/node_templates/data_retention.xml
+++ b/bareon/tests_functional/node_templates/data_retention.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/data_retention_blank_primary.xml b/bareon/tests_functional/node_templates/data_retention_blank_primary.xml
index 837f8ee..7004784 100644
--- a/bareon/tests_functional/node_templates/data_retention_blank_primary.xml
+++ b/bareon/tests_functional/node_templates/data_retention_blank_primary.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/data_retention_with_unlabelled_disk.xml b/bareon/tests_functional/node_templates/data_retention_with_unlabelled_disk.xml
index d1ed6f4..1a8bed9 100644
--- a/bareon/tests_functional/node_templates/data_retention_with_unlabelled_disk.xml
+++ b/bareon/tests_functional/node_templates/data_retention_with_unlabelled_disk.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/one_disk.xml b/bareon/tests_functional/node_templates/one_disk.xml
index 93fdb8e..3f373b2 100644
--- a/bareon/tests_functional/node_templates/one_disk.xml
+++ b/bareon/tests_functional/node_templates/one_disk.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/one_disk_persistent.xml b/bareon/tests_functional/node_templates/one_disk_persistent.xml
index 8e9c8e0..fc1bd71 100644
--- a/bareon/tests_functional/node_templates/one_disk_persistent.xml
+++ b/bareon/tests_functional/node_templates/one_disk_persistent.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/two_disks.xml b/bareon/tests_functional/node_templates/two_disks.xml
index 81f2a4b..422151d 100644
--- a/bareon/tests_functional/node_templates/two_disks.xml
+++ b/bareon/tests_functional/node_templates/two_disks.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>
diff --git a/bareon/tests_functional/node_templates/two_disks_multiboot.xml b/bareon/tests_functional/node_templates/two_disks_multiboot.xml
index 0ce7f85..ca67b8b 100644
--- a/bareon/tests_functional/node_templates/two_disks_multiboot.xml
+++ b/bareon/tests_functional/node_templates/two_disks_multiboot.xml
@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='{{ domain_type }}'>
 <name>{{ node_name }}</name>
   <memory>3145728</memory>
   <currentMemory>3145728</currentMemory>