Merge "Disable dstat to enable tests on Ubuntu 20.04"

.zuul.d/base.yaml

@@ -45,6 +45,8 @@
       devstack_services:
         # TODO(dmellado):Temporary workaround until proper fix
         base: false
+        # Need to disable dstat due to bug https://github.com/dstat-real/dstat/pull/162
+        dstat: false
         s-account: false
         s-container: false
         s-object: false
@@ -111,6 +113,8 @@
       devstack_services:
         # TODO(dmellado):Temporary workaround until proper fix
         base: false
+        # Need to disable dstat due to bug https://github.com/dstat-real/dstat/pull/162
+        dstat: false
         s-account: false
         s-container: false
         s-object: false

.zuul.d/multinode.yaml

@@ -17,7 +17,7 @@
     parent: kuryr-kubernetes-tempest
     description: |
         Kuryr-Kubernetes tempest multinode job
-    nodeset: openstack-two-node-bionic
+    nodeset: openstack-two-node-focal
     host-vars:
       controller:
         devstack_plugins:
@@ -30,6 +30,8 @@
           devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
           kuryr-kubernetes: https://opendev.org/openstack/kuryr
         devstack_services:
+          # Need to disable dstat due to bug https://github.com/dstat-real/dstat/pull/162
+          dstat: false
           kuryr-kubernetes: false
           kubernetes-api: false
           kubernetes-controller-manager: false