From c43f423530d32f6ac0c245b996642e7503b6b043 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Fri, 24 Feb 2023 15:30:47 +0000
Subject: [PATCH] Specify a specific version of docker

The latest version of docker broke kuryr-libnetwork which in-term
broke use. We hardcode an older version of docker to workaround.

Depends-On: https://review.opendev.org/c/openstack/devstack-plugin-container/+/875113
Change-Id: I4c0fa9b135b11db93b0a9fc757865f3ff92cf4b2
---
 .zuul.yaml        | 1 -
 devstack/settings | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b7317e665..914cfb457 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -55,7 +55,6 @@
     name: zun-tempest-base-multinode
     parent: zun-tempest-base
     description: Zun Devstack tempest multinode base job
-    nodeset: openstack-two-node-focal
     timeout: 7800
     vars:
       devstack_localrc:
diff --git a/devstack/settings b/devstack/settings
index 0eb51ece4..fca70b6d4 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -24,6 +24,8 @@ ENABLE_KATA_CONTAINERS=${ENABLE_KATA_CONTAINERS:-false}
 CNI_PLUGINS_INSTALL_PLUGINS=loopback,zun-cni
 CNI_PLUGINS_CONF_SOURCE_DIR=$DEST/zun/etc/cni/net.d
 
+UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-5:20.10.23~3-0~ubuntu-jammy}
+
 # Enable Zun services
 if [[ ${HOST_IP} == ${SERVICE_HOST} ]] || [[ "[${HOST_IPV6}]" == "${SERVICE_HOST}" ]]; then
     enable_service zun-api