From a28fd66b6e0eee1e79f07f8b2ecab8853958ef47 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 12 Mar 2020 15:54:33 +0000 Subject: [PATCH] CentOS 8: Enable overcloud upgrade job Missing bifrost image for Train, so no seed upgrade job yet. Depends-On: https://review.opendev.org/711067 Change-Id: I0e88683f775769c1a80879685b0e7a2983599b08 Story: 2006574 Task: 39047 --- playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 | 7 +++++++ playbooks/kayobe-overcloud-upgrade-base/pre.yml | 8 ++++++++ zuul.d/project.yaml | 8 +++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 0d9a25b44..9fec45fdd 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/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 diff --git a/playbooks/kayobe-overcloud-upgrade-base/pre.yml b/playbooks/kayobe-overcloud-upgrade-base/pre.yml index 7809b50bc..cefbe5df2 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/pre.yml +++ b/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" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5b059ae2d..0dcbef32e 100644 --- a/zuul.d/project.yaml +++ b/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