commit 0610413f0561eede3f44182c0896da7ff6f8cd05
author Zuul <zuul@review.opendev.org> Fri Nov 08 01:30:31 2019 +0000
committer Gerrit Code Review <review@openstack.org> Fri Nov 08 01:30:31 2019 +0000
tree dd5854180d6f37bb6716ceb626323117fda92020
parent 63ab664baf99716e9a5d29eb82f974f8c3456816
parent 5c6b3c32791f6a1b6e3646e739d41ae86d866d45

Merge "Add override variable for LIBVIRT_TYPE"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index f7594d4..cc94369 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -219,8 +219,8 @@
         VERBOSE_NO_TIMESTAMP: true
         NOVNC_FROM_PACKAGE: true
         ERROR_ON_CLONE: true
-        # Gate jobs can't deal with nested virt. Disable it.
-        LIBVIRT_TYPE: qemu
+        # Gate jobs can't deal with nested virt. Disable it by default.
+        LIBVIRT_TYPE: '{{ devstack_libvirt_type | default("qemu") }}'
       devstack_services:
         # Ignore any default set by devstack. Emit a "disable_all_services".
         base: false