Merge "Use configure-swap from o-z-j"
diff --git a/.zuul.yaml b/.zuul.yaml
index 8d3b2f4..fb67a38 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -63,6 +63,8 @@
         NETWORK_GATEWAY: 10.1.0.1
         NOVNC_FROM_PACKAGE: True
         ERROR_ON_CLONE: True
+        # Gate jobs can't deal with nested virt. Disable it.
+        LIBVIRT_TYPE: qemu
         # NOTE(dims): etcd 3.x is not available in debian/ubuntu
         # etc. As a stop gap measure, devstack uses wget to download
         # from the location below for all the CI jobs.