From 9646d75183e24b0a9ae77cd50d584480bb5c0e2f Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 10 Nov 2023 15:28:55 +0000 Subject: [PATCH 01/12] Bump Neutron tag to fix multiple bugs --- etc/kayobe/kolla/globals.yml | 2 ++ ...fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml | 6 ++++++ ...ion-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml | 9 +++++++++ 3 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml create mode 100644 releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 19dfa9e3d..1b0c14886 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -20,6 +20,8 @@ kayobe_image_tags: # with signature: `Missing section footer for 0000:00:01.3/piix4_pm`. Test carefully before bumping. centos: yoga-20230718T112646 +neutron_tag: yoga-20231110T152125 + nova_tag: yoga-20231103T161400 nova_libvirt_tag: "{% raw %}{{ kayobe_image_tags['nova_libvirt'][kolla_base_distro] | default(nova_tag) }}{% endraw %}" diff --git a/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml b/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml new file mode 100644 index 000000000..dc5f3c2bf --- /dev/null +++ b/releasenotes/notes/fix-lb-fip-issue-when-neutron-restarts-6aafd03d115a1ee4.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes Neutron so that load balancer FIPs are not broken on Neutron restart. + See `Neutron bug report + `__. diff --git a/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml b/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml new file mode 100644 index 000000000..bec2cafb8 --- /dev/null +++ b/releasenotes/notes/fix-regression-plugging-802-3ad-port-group-cd48d2e6f43b363f.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fixes issue where Netmiko devices were sending no commands to the switch + since plug_bond_to_network is overridden in + networking_generic_switch/devices/netmiko_devices/init.py and + PLUG_BOND_TO_NETWORK to set to None. + See `NGS bug report + `__. From 16f33e2f26527ab82f6f232f6bd506058acd034f Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 10 Nov 2023 17:31:11 +0100 Subject: [PATCH 02/12] Bump Ceph images to latest stable releases --- etc/kayobe/cephadm.yml | 2 +- releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index 15460331b..0e0b2fceb 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -12,7 +12,7 @@ cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. -cephadm_image_tag: "{{ 'v17.2.6' if os_release == 'jammy' else 'v16.2.11' }}" +cephadm_image_tag: "{{ 'v17.2.7' if os_release == 'jammy' else 'v16.2.14' }}" # Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy. cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}" diff --git a/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml new file mode 100644 index 000000000..9f51216a5 --- /dev/null +++ b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Updates default Ceph images to v17.2.7 for Quincy and v16.2.14 for Pacific. From be9efd1c9f9c76fd352cbd6a7e877f8a155b9c07 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 13 Nov 2023 09:27:53 +0000 Subject: [PATCH 03/12] Check if repos backup exists in kolla footer When a child service is build, such as neutron-infoblox-ipam-agent being a child of neutron-server, the fotoer is ran twice. This means it fails as the repo backup has already been moved. --- etc/kayobe/kolla.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 17257688d..d16e6dd1c 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -352,18 +352,22 @@ kolla_build_blocks: {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} {% if kolla_base_distro in ['centos', 'rocky'] %} RUN \ - tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ - if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ - echo "Found repository mirror in Yum repositories"; \ - exit 1; \ - fi && \ - rm -rf /etc/yum.repos.d.backup/ + if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \ + tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ + if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ + echo "Found repository mirror in Yum repositories"; \ + exit 1; \ + fi && \ + rm -rf /etc/yum.repos.d.backup/ + fi {% else %} RUN \ - mv /etc/apt/sources.list.backup /etc/apt/sources.list && \ - if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ - echo "Found repository mirror in APT repositories"; \ - exit 1; \ + if [ -f /etc/apt/sources.list.backup ]; then \ + mv /etc/apt/sources.list.backup /etc/apt/sources.list && \ + if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ + echo "Found repository mirror in APT repositories"; \ + exit 1; \ + fi fi {% endif %} {% endif %} From 3be54580498c569c019dec9c987c11075f614dce Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 13 Nov 2023 10:27:41 +0000 Subject: [PATCH 04/12] Still check for stackhpc repos in footer --- etc/kayobe/kolla.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index d16e6dd1c..66d8171a1 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -353,21 +353,21 @@ kolla_build_blocks: {% if kolla_base_distro in ['centos', 'rocky'] %} RUN \ if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \ - tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ - if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ - echo "Found repository mirror in Yum repositories"; \ - exit 1; \ - fi && \ + tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d rm -rf /etc/yum.repos.d.backup/ - fi + fi && \ + if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ + echo "Found repository mirror in Yum repositories"; \ + exit 1; \ + fi && \ {% else %} RUN \ if [ -f /etc/apt/sources.list.backup ]; then \ - mv /etc/apt/sources.list.backup /etc/apt/sources.list && \ - if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ - echo "Found repository mirror in APT repositories"; \ - exit 1; \ - fi + mv /etc/apt/sources.list.backup /etc/apt/sources.list + fi && \ + if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ + echo "Found repository mirror in APT repositories"; \ + exit 1; \ fi {% endif %} {% endif %} From 1f8962a7a47a1377ec2f6907f2c23f6abcd53dd2 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 13 Nov 2023 11:45:51 +0000 Subject: [PATCH 05/12] Apply suggestions from code review Co-authored-by: Mark Goddard --- etc/kayobe/kolla.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 66d8171a1..fc93c1558 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -353,17 +353,17 @@ kolla_build_blocks: {% if kolla_base_distro in ['centos', 'rocky'] %} RUN \ if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \ - tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d - rm -rf /etc/yum.repos.d.backup/ + tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ + rm -rf /etc/yum.repos.d.backup/ \ fi && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ echo "Found repository mirror in Yum repositories"; \ exit 1; \ - fi && \ + fi {% else %} RUN \ if [ -f /etc/apt/sources.list.backup ]; then \ - mv /etc/apt/sources.list.backup /etc/apt/sources.list + mv /etc/apt/sources.list.backup /etc/apt/sources.list \ fi && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ echo "Found repository mirror in APT repositories"; \ From 7c2f630d8257b0fd0f453aa2f28729bdc219a61e Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 13 Nov 2023 12:34:38 +0000 Subject: [PATCH 06/12] Fix bash in footer --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index fc93c1558..1f975c609 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -354,7 +354,7 @@ kolla_build_blocks: RUN \ if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \ tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ - rm -rf /etc/yum.repos.d.backup/ \ + rm -rf /etc/yum.repos.d.backup/; \ fi && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \ echo "Found repository mirror in Yum repositories"; \ @@ -363,7 +363,7 @@ kolla_build_blocks: {% else %} RUN \ if [ -f /etc/apt/sources.list.backup ]; then \ - mv /etc/apt/sources.list.backup /etc/apt/sources.list \ + mv /etc/apt/sources.list.backup /etc/apt/sources.list; \ fi && \ if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \ echo "Found repository mirror in APT repositories"; \ From 85204273fe554ef1a9a2231d6e9f2a9664b808f5 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 14 Nov 2023 09:26:30 +0100 Subject: [PATCH 07/12] Fix libvirtd memory leak in CentOS Stream 8 All nova images were rebuilt for CentOS Stream 8. Images for other distributions are unmodified because they are not affected. The qemu-kvm package is pinned to the latest version able to live migrate from qemu-kvm-6.2.0-20.module_el8.7.0+1218+f626c2ff in the stackhpc kolla fork [1]. [1] https://github.com/stackhpc/kolla/pull/279 --- etc/kayobe/kolla/globals.yml | 11 +++++------ .../fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 51d2eb7df..feffb1dcb 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -15,14 +15,13 @@ kayobe_image_tags: centos: yoga-20231024T093507 rocky: yoga-20231024T093507 ubuntu: yoga-20231024T093507 - nova_libvirt: - # Live-migration is broken from qemu-kvm-6.2.0-20.module_el8.7.0+1218+f626c2ff to qemu-kvm-6.2.0-39.module_el8+669+76cc32af - # with signature: `Missing section footer for 0000:00:01.3/piix4_pm`. Test carefully before bumping. - centos: yoga-20230718T112646 + nova: + centos: yoga-20231113T171023 + rocky: yoga-20231103T161400 + ubuntu: yoga-20231103T161400 cloudkitty_tag: yoga-20231107T165648 -nova_tag: yoga-20231103T161400 -nova_libvirt_tag: "{% raw %}{{ kayobe_image_tags['nova_libvirt'][kolla_base_distro] | default(nova_tag) }}{% endraw %}" +nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" diff --git a/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml b/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml new file mode 100644 index 000000000..30e9b5892 --- /dev/null +++ b/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes a libvirtd memory leak on CentOS Stream 8. See `Red Hat Bugzilla bug + 2143235 `__ for more + details. From e446d94b869986903c6c5b734dafa053c1200806 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 14 Nov 2023 13:57:00 +0000 Subject: [PATCH 08/12] New neutron tag --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index feffb1dcb..337687d65 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -22,6 +22,7 @@ kayobe_image_tags: cloudkitty_tag: yoga-20231107T165648 nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" +neutron_tag: yoga-20231114T125927 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" From 3a36c8f0b2060eb413a96dbb8ce4460e0995944f Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 14 Nov 2023 20:41:25 +0000 Subject: [PATCH 09/12] Fix cloudkitty_tag --- etc/kayobe/kolla/globals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 65df749bb..8880e5126 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -27,7 +27,7 @@ kayobe_image_tags: openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}" bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}" ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}" -cliudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" +cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" om_enable_rabbitmq_high_availability: true From 405c6d4d28037ccf26cbb72ad39920fa7c77746e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 14 Nov 2023 20:42:34 +0000 Subject: [PATCH 10/12] Remove invalid reno for zed --- .../notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml diff --git a/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml b/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml deleted file mode 100644 index 30e9b5892..000000000 --- a/releasenotes/notes/fix-libvirt-memory-leak-1a8c7a66679b9de7.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Fixes a libvirtd memory leak on CentOS Stream 8. See `Red Hat Bugzilla bug - 2143235 `__ for more - details. From ae93adfe8b19834c64f73b82298a6677627e1d4b Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 15 Nov 2023 10:38:01 +0000 Subject: [PATCH 11/12] Add Neutron tag --- etc/kayobe/kolla/globals.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 8880e5126..83e919339 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -23,11 +23,15 @@ kayobe_image_tags: cloudkitty: rocky: zed-rocky-9-20231114T124701 ubuntu: zed-ubuntu-jammy-20231114T124701 + neutron: + rocky: zed-rocky-9-20231115T094053 + ubuntu: zed-ubuntu-jammy-20231115T094053 openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}" bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}" ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}" cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" +neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" om_enable_rabbitmq_high_availability: true From 0c231402a748e565a8754242992f2ebda2c2d86b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Nov 2023 10:41:05 +0000 Subject: [PATCH 12/12] Fix Ceph reno for Zed --- releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml index 9f51216a5..439f8b842 100644 --- a/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml +++ b/releasenotes/notes/bump-ceph-images-f9d4721aa1d37729.yaml @@ -1,4 +1,4 @@ --- upgrade: - | - Updates default Ceph images to v17.2.7 for Quincy and v16.2.14 for Pacific. + Updates default Ceph images to v17.2.7 for Quincy.