Prevent use of KVM for Tenks VMs in CI

Currently nested virtualisation under KVM does not seem to be working in
CI. This breaks the 'bare metal' deployment testing using Tenks, which
lead us to disable it in 749ef824.

This commit forces Tenks to use QEMU for its VMs, allowing us to revert
commit 749ef824..

Change-Id: Id382c218f3b37979341f0d96718a6011a1d9da37
Story: 2005316
Task: 30223

dev/tenks-deploy-config-compute.yml

@@ -34,3 +34,7 @@ deploy_ramdisk: ipa.initramfs
 # Use a custom socket path to avoid a conflict with the nova_libvirt kolla
 # container which bind mounts /var/run/libvirt.
 libvirt_custom_socket_path: /var/run/libvirt-tenks
+
+# Nested virtualisation is not working well in CI currently. Force the use of
+# QEMU.
+libvirt_vm_engine: "qemu"

dev/tenks-deploy-config-overcloud.yml

@@ -31,3 +31,7 @@ physnet_mappings:
 
 # No placement service.
 wait_for_placement: false
+
+# Nested virtualisation is not working well in CI currently. Force the use of
+# QEMU.
+libvirt_vm_engine: "qemu"

playbooks/kayobe-overcloud-base/run.yml

@@ -26,10 +26,7 @@
         cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm
         chdir: "{{ kayobe_src_dir }}"
 
-    # NOTE(mgoddard): Bare metal testing in CI is currently very unreliable,
-    # making it difficult to merge patches. Skip this part of the testing until
-    # this can be improved.
-    # - name: Perform testing of the baremetal machines
-    #   shell:
-    #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
-    #     chdir: "{{ kayobe_src_dir }}"
+    - name: Perform testing of the baremetal machines
+      shell:
+        cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
+        chdir: "{{ kayobe_src_dir }}"

playbooks/kayobe-overcloud-upgrade-base/run.yml

@@ -74,13 +74,10 @@
             cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-vm-pre-upgrade
             chdir: "{{ previous_kayobe_src_dir }}"
 
-        # NOTE(mgoddard): Bare metal testing in CI is currently very
-        # unreliable, making it difficult to merge patches. Skip this part of
-        # the testing until # this can be improved.
-        # - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
-        #   shell:
-        #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
-        #     chdir: "{{ kayobe_src_dir }}"
+        - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
+          shell:
+            cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
+            chdir: "{{ kayobe_src_dir }}"
 
         # Upgrade Kayobe, and use it to perform an upgrade of the control plane.
 
@@ -103,13 +100,10 @@
             cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm-post-upgrade
             chdir: "{{ kayobe_src_dir }}"
 
-        # NOTE(mgoddard): Bare metal testing in CI is currently very
-        # unreliable, making it difficult to merge patches. Skip this part of
-        # the testing until # this can be improved.
-        # - name: Perform testing of the baremetal machines in the upgraded overcloud
-        #   shell:
-        #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
-        #     chdir: "{{ kayobe_src_dir }}"
+        - name: Perform testing of the baremetal machines in the upgraded overcloud
+          shell:
+            cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
+            chdir: "{{ kayobe_src_dir }}"
 
       environment:
         KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"