openstack/kolla-ansible
Code Issues Proposed changes

Merge "[CI] Ensure network is set for Zun"

Browse Source
This commit is contained in:
Zuul 2020-09-14 12:18:27 +00:00 committed by Gerrit Code Review
commit b49c86848d
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test-zun.sh
View File

@ -15,7 +15,7 @@ function test_zun_logged {
openstack subnet set --no-dhcp demo-subnet openstack subnet set --no-dhcp demo-subnet
sudo docker pull alpine sudo docker pull alpine
sudo docker save alpine | openstack image create alpine --public --container-format docker --disk-format raw sudo docker save alpine | openstack image create alpine --public --container-format docker --disk-format raw
openstack appcontainer run --name test alpine sleep 1000 openstack appcontainer run --net network=demo-net --name test alpine sleep 1000
attempt=1 attempt=1
while [[ $(openstack appcontainer show test -f value -c status) != "Running" ]]; do while [[ $(openstack appcontainer show test -f value -c status) != "Running" ]]; do
echo "Container not running yet" echo "Container not running yet"
@ -61,7 +61,7 @@ function test_zun_logged {
fi fi
sleep 10 sleep 10
done done
openstack appcontainer run --name test2 --mount source=zun_test_volume,destination=/data alpine sleep 1000 openstack appcontainer run --net network=demo-net --name test2 --mount source=zun_test_volume,destination=/data alpine sleep 1000
attempt=1 attempt=1
while [[ $(openstack volume show zun_test_volume -f value -c status) != "in-use" ]]; do while [[ $(openstack volume show zun_test_volume -f value -c status) != "in-use" ]]; do
echo "Volume not attached yet" echo "Volume not attached yet"
@ -105,6 +105,12 @@ capsuleVersion: beta
kind: capsule kind: capsule
metadata: metadata:
name: capsule-test name: capsule-test
# NOTE(yoctozepto): Capsules do not support nets in Ussuri.
# See https://bugs.launchpad.net/zun/+bug/1895263
# The choice for CI is worked around by ensuring the networks are created
# in the desired order in init-runonce.
#nets:
# - network: demo-net
spec: spec:
containers: containers:
- image: alpine - image: alpine

17
tools/init-runonce
View File

@ -77,21 +77,20 @@ $KOLLA_OPENSTACK_COMMAND image create --disk-format qcow2 --container-format bar
--property os_type=${IMAGE_TYPE} --file ${IMAGE_PATH}/${IMAGE} ${IMAGE_NAME} --property os_type=${IMAGE_TYPE} --file ${IMAGE_PATH}/${IMAGE} ${IMAGE_NAME}
echo Configuring neutron. echo Configuring neutron.
$KOLLA_OPENSTACK_COMMAND router create demo-router
$KOLLA_OPENSTACK_COMMAND network create demo-net
$KOLLA_OPENSTACK_COMMAND subnet create --subnet-range 10.0.0.0/24 --network demo-net \
--gateway 10.0.0.1 --dns-nameserver 8.8.8.8 demo-subnet
$KOLLA_OPENSTACK_COMMAND router add subnet demo-router demo-subnet
if [[ $ENABLE_EXT_NET -eq 1 ]]; then if [[ $ENABLE_EXT_NET -eq 1 ]]; then
$KOLLA_OPENSTACK_COMMAND network create --external --provider-physical-network physnet1 \ $KOLLA_OPENSTACK_COMMAND network create --external --provider-physical-network physnet1 \
--provider-network-type flat public1 --provider-network-type flat public1
$KOLLA_OPENSTACK_COMMAND subnet create --no-dhcp \ $KOLLA_OPENSTACK_COMMAND subnet create --no-dhcp \
--allocation-pool ${EXT_NET_RANGE} --network public1 \ --allocation-pool ${EXT_NET_RANGE} --network public1 \
--subnet-range ${EXT_NET_CIDR} --gateway ${EXT_NET_GATEWAY} public1-subnet --subnet-range ${EXT_NET_CIDR} --gateway ${EXT_NET_GATEWAY} public1-subnet
fi
$KOLLA_OPENSTACK_COMMAND network create demo-net
$KOLLA_OPENSTACK_COMMAND subnet create --subnet-range 10.0.0.0/24 --network demo-net \
--gateway 10.0.0.1 --dns-nameserver 8.8.8.8 demo-subnet
$KOLLA_OPENSTACK_COMMAND router create demo-router
$KOLLA_OPENSTACK_COMMAND router add subnet demo-router demo-subnet
if [[ $ENABLE_EXT_NET -eq 1 ]]; then
$KOLLA_OPENSTACK_COMMAND router set --external-gateway public1 demo-router $KOLLA_OPENSTACK_COMMAND router set --external-gateway public1 demo-router
fi fi