Merge "CentOS 8: Enable overcloud upgrade job"

playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2

@@ -19,3 +19,10 @@ kolla_openstack_logging_debug: true
 # Use the CI infra's PyPI mirror.
 pip_local_mirror: true
 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

playbooks/kayobe-overcloud-upgrade-base/pre.yml

@@ -19,3 +19,11 @@
         - "ip l add breth1 type bridge"
         - "ip l set breth1 up"
         - "ip a add 192.168.33.3/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"

zuul.d/project.yaml

@@ -11,8 +11,7 @@
         - kayobe-tox-ansible
         - kayobe-tox-molecule
         - kayobe-overcloud-centos8
-        # TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
-        # - kayobe-overcloud-upgrade-centos8
+        - kayobe-overcloud-upgrade-centos8
         - kayobe-seed-centos8
         # TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
         # - kayobe-seed-upgrade-centos8
@@ -24,8 +23,7 @@
         - kayobe-tox-ansible
         - kayobe-tox-molecule
         - kayobe-overcloud-centos8
-        # TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
-        # - kayobe-overcloud-upgrade-centos8
+        - kayobe-overcloud-upgrade-centos8
         - kayobe-seed-centos8
         # TODO(mgoddard): Enable upgrade jobs when CentOS 8 support in Train.
-        # - kayobe-seed-upgrade-centos
+        # - kayobe-seed-upgrade-centos8