openstack/kolla-ansible
Code Issues Proposed changes

Merge "zun: Fix capsule functionality and tests"

Browse Source
This commit is contained in:
Zuul 2023-08-01 13:15:46 +00:00 committed by Gerrit Code Review
commit 4bfd9d85cd
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/zun/templates/zun.conf.j2
View File

@ -13,6 +13,8 @@ state_path = /var/lib/zun
container_driver = docker container_driver = docker
capsule_driver = cri capsule_driver = cri
sandbox_image = k8s.gcr.io/pause:3.6
[network] [network]
driver = kuryr driver = kuryr

6
tests/test-zun.sh
View File

@ -101,12 +101,6 @@ function test_zun_logged {
openstack volume delete zun_test_volume openstack volume delete zun_test_volume
echo "SUCCESS: Zun Cinder volume attachment" 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" echo "TESTING: Zun capsule"
cat >/tmp/capsule.yaml <<EOF cat >/tmp/capsule.yaml <<EOF
capsuleVersion: beta capsuleVersion: beta