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 <