From 3fc1ce3f304bcf081e7edd8bf00ec66d9106d5f3 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 11 Oct 2024 10:43:18 +0100 Subject: [PATCH 1/4] [2023.1] Fix eswitchd and neutron_mlnx_agent not using our fork The neutron_mlnx_agent based containers are not using the neutron plugins, so we need to customize the pip package directly. --- etc/kayobe/kolla.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index c7fcc0675..ed5ef31e9 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -456,6 +456,8 @@ kolla_build_customizations_common: nova_compute_packages_append: - python3-libvirt - python3-ethtool + neutron_mlnx_agent_pip_packages_override: + - networking-mlnx@git+https://github.com/stackhpc/networking-mlnx@stackhpc/{{ openstack_release }} kolla_build_customizations_rocky: kolla_toolbox_packages_remove: From 3498df7032ba2c58e992171d76cd2dbdc7c97d48 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 11 Oct 2024 11:01:45 +0100 Subject: [PATCH 2/4] Bump neutron containers --- etc/kayobe/kolla-image-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 017319e3d..77000ad34 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -33,8 +33,8 @@ kolla_image_tags: manila: rocky-9: 2023.1-rocky-9-20240809T102431 neutron: - rocky-9: 2023.1-rocky-9-20240926T151818 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818 + rocky-9: 2023.1-rocky-9-20241011T094404 + ubuntu-jammy: 2023.1-ubuntu-jammy-20241011T094404 nova: rocky-9: 2023.1-rocky-9-20240926T151818 ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818 From 5d80c641cf41b77b75d6fa5ff1ca1d6b454195cb Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 11 Oct 2024 18:48:53 +0100 Subject: [PATCH 3/4] Update kolla-image-tags.yml --- etc/kayobe/kolla-image-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 77000ad34..47b2309e0 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -33,8 +33,8 @@ kolla_image_tags: manila: rocky-9: 2023.1-rocky-9-20240809T102431 neutron: - rocky-9: 2023.1-rocky-9-20241011T094404 - ubuntu-jammy: 2023.1-ubuntu-jammy-20241011T094404 + rocky-9: 2023.1-rocky-9-20241011T174500 + ubuntu-jammy: 2023.1-ubuntu-jammy-20241011T174500 nova: rocky-9: 2023.1-rocky-9-20240926T151818 ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818 From 0aaa25561ce3a9dd2b05da414336e85deb636fcb Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 11 Oct 2024 22:28:05 +0100 Subject: [PATCH 4/4] Update kolla-image-tags.yml --- etc/kayobe/kolla-image-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 47b2309e0..d83f888f6 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -33,8 +33,8 @@ kolla_image_tags: manila: rocky-9: 2023.1-rocky-9-20240809T102431 neutron: - rocky-9: 2023.1-rocky-9-20241011T174500 - ubuntu-jammy: 2023.1-ubuntu-jammy-20241011T174500 + rocky-9: 2023.1-rocky-9-20241011T212435 + ubuntu-jammy: 2023.1-ubuntu-jammy-20241011T212435 nova: rocky-9: 2023.1-rocky-9-20240926T151818 ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818