From 778523816b747197d34ab68e1db61f672f721b7f Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 29 Jun 2023 17:36:55 +0200
Subject: [PATCH] zun: Fix capsule functionality and tests

Change-Id: I7b998b34881084a68669dc9351ea1937c61534fa
---
 ansible/roles/zun/templates/zun.conf.j2 | 2 ++
 tests/test-zun.sh                       | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index 1f57e171ba..c67e06b204 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -13,6 +13,8 @@ state_path = /var/lib/zun
 container_driver = docker
 capsule_driver = cri
 
+sandbox_image = k8s.gcr.io/pause:3.6
+
 [network]
 driver = kuryr
 
diff --git a/tests/test-zun.sh b/tests/test-zun.sh
index d01d2da2c2..d91134711a 100755
--- a/tests/test-zun.sh
+++ b/tests/test-zun.sh
@@ -101,12 +101,6 @@ function test_zun_logged {
     openstack volume delete zun_test_volume
     echo "SUCCESS: Zun Cinder volume attachment"
 
-    # NOTE(hongbin): temporarily skip capsule test due to #1941982
-    # See https://bugs.launchpad.net/zun/+bug/1941982
-    if [[ $BASE_DISTRO =~ ^(debian|ubuntu)$ ]]; then
-        return 0
-    fi
-
     echo "TESTING: Zun capsule"
     cat >/tmp/capsule.yaml <<EOF
 capsuleVersion: beta