From 0e9fa44f9a2fecf66496412bcc7fc0ebe106db82 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 21 Mar 2025 12:02:56 +0100
Subject: [PATCH] update ovs/ovn in RL9 in caracal multiple bug fixes for ovs
 [1] and ovn [2] - especially MAC binding aging

[1] https://git.centos.org/rpms/openvswitch/blob/c9s-sig-nfv-openvswitch-3.3/f/SPECS/openvswitch3.3.spec#_1020
[2] https://git.centos.org/rpms/ovn/blob/c9s-sig-nfv-ovn24.03/f/SPECS/ovn24.03.spec#_535

Kolla Toolbox, Manila, Neutron, Nova, and Octavia containers received
updates on both Rocky Linux 9 and Ubuntu. Only the Rocky Linux 9 images
include the new OVS versions.
---
 etc/kayobe/kolla-image-tags.yml   | 25 ++++++++++++-------------
 etc/kayobe/pulp-repo-versions.yml |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 144fa59d3..a3ef0ccb4 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -28,32 +28,31 @@ kolla_image_tags:
     rocky-9: 2023.1-rocky-9-20241022T090717
     ubuntu-jammy: 2023.1-ubuntu-jammy-20241022T090717
   kolla_toolbox:
-    rocky-9: 2023.1-rocky-9-20240809T102431
+    rocky-9: 2023.1-rocky-9-20250321T110513
   letsencrypt:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
   magnum:
     rocky-9: 2023.1-rocky-9-20240821T102442
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240821T102442
   manila:
-    rocky-9: 2023.1-rocky-9-20240809T102431
+    rocky-9: 2023.1-rocky-9-20250321T110513
   neutron:
-    rocky-9: 2023.1-rocky-9-20250311T093325
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20250311T093325
+    rocky-9: 2023.1-rocky-9-20250321T110513
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20250321T110513
   nova:
-    rocky-9: 2023.1-rocky-9-20240926T151818
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818
-  nova_compute:
-    rocky-9: 2023.1-rocky-9-20250121T090235
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20250121T090235
+    rocky-9: 2023.1-rocky-9-20250321T110513
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20250321T110513
   octavia:
-    rocky-9: 2023.1-rocky-9-20241015T100903
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20241015T100903
+    rocky-9: 2023.1-rocky-9-20250321T110513
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20250321T110513
   opensearch:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444
   openvswitch:
-    rocky-9: 2023.1-rocky-9-20241121T221758
+    rocky-9: 2023.1-rocky-9-20250321T110513
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20250321T110513
   ovn:
-    rocky-9: 2023.1-rocky-9-20241121T221758
+    rocky-9: 2023.1-rocky-9-20250321T110513
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20250321T110513
   rabbitmq:
     rocky-9: 2023.1-rocky-9-20240925T133913
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240823T101942
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 563e86d0e..eccc117de 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -2,7 +2,7 @@
 # This file is autogenerated by Ansible using the following workflow:
 # https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
 stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
-stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20241120T012306
+stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250314T043049
 stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240702T000233
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751