CI: add dummy1 port for seed upgrade and VM jobs

For some reason this configuration was omitted or incomplete in these
jobs. Without this configuration, Kayobe development configuration adds
eth1 to the breth1 bridge if it exists, or leaves the bridge without a
port otherwise. This can lead to network connectivity issues, if the IP
address of eth1 becomes inaccessible when it is added to breth1.

This change fixes the issue by ensuring that the dummy1 interface
exists, and configuring the aio network to add it to breth1 as a port,
instead of eth1.

Change-Id: I47115e5d8d1fb448cb9e46dc43b56c64987e428b
This commit is contained in:
Mark Goddard 2020-11-24 10:35:00 +00:00
parent ae93b364e5
commit 0766df1673
3 changed files with 23 additions and 0 deletions

View File

@ -14,6 +14,7 @@ kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org
kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}" kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
pip_upper_constraints_file: "/tmp/upper-constraints.txt" pip_upper_constraints_file: "/tmp/upper-constraints.txt"
{% endif %} {% endif %}
kolla_openstack_logging_debug: True
# NOTE(mgoddard): We're using a cirros image, which doesn't require the # NOTE(mgoddard): We're using a cirros image, which doesn't require the
# resolv.conf work around used for CentOS. # resolv.conf work around used for CentOS.
@ -22,3 +23,10 @@ overcloud_host_image_workaround_resolv_enabled: false
# Use the CI infra's PyPI mirror. # Use the CI infra's PyPI mirror.
pip_local_mirror: true pip_local_mirror: true
pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple" pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
# and removes the bridge if there are no interfaces left. When Kayobe bounces
# veth links plugged into the bridge, it causes the bridge which has the IP we
# are using for SSH to be removed. Use a dummy interface.
aio_bridge_ports:
- dummy1

View File

@ -29,3 +29,11 @@
- "ip l add breth1 type bridge" - "ip l add breth1 type bridge"
- "ip l set breth1 up" - "ip l set breth1 up"
- "ip a add 192.168.33.5/24 dev breth1" - "ip a add 192.168.33.5/24 dev breth1"
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during
# ifdown, and removes the bridge if there are no interfaces left. When
# Kayobe bounces veth links plugged into the bridge, it causes the
# bridge which has the IP we are using for SSH to be removed. Use a
# dummy interface.
- "ip l add dummy1 type dummy"
- "ip l set dummy1 up"
- "ip l set dummy1 master breth1"

View File

@ -42,3 +42,10 @@ seed_vm_configdrive_device: disk
# /etc/network/interfaces. # /etc/network/interfaces.
configdrive_os_family: Debian configdrive_os_family: Debian
configdrive_debian_network_interfaces_supports_glob: false configdrive_debian_network_interfaces_supports_glob: false
# NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
# and removes the bridge if there are no interfaces left. When Kayobe bounces
# veth links plugged into the bridge, it causes the bridge which has the IP we
# are using for SSH to be removed. Use a dummy interface.
aio_bridge_ports:
- dummy1