2025.1 Fix kayobe container image builds & pin OVS

Author: Alex-Welsh

.github/workflows/stackhpc-container-image-build.yml

@@ -198,6 +198,14 @@ jobs:
       - name: Create build logs output directory
         run: mkdir image-build-logs
 
+      - name: Write apt config to file
+        run: |
+            cat > stackhpc-apt-preferences <<EOF
+            Package: openvswitch-switch openvswitch-common openvswitch-common-dpdk python3-openvswitch
+            Pin: version 3.3.*
+            Pin-Priority: 1001
+            EOF
+
       - name: Build kolla overcloud images
         id: build_overcloud_images
         continue-on-error: true

etc/kayobe/apt.yml

@@ -76,7 +76,12 @@ apt_repositories: "{{ stackhpc_apt_repositories | selectattr('required') | list
 # * filename: name of a file in /etc/apt/preferences.d/ in which to write
 #   the configuration
 # Default is an empty list.
-#apt_preferences:
+apt_preferences:
+  - content: |
+      Package: openvswitch-switch openvswitch-common openvswitch-common-dpdk
+      Pin: version 3.3.*
+      Pin-Priority: 1001
+    filename: stackhpc-openvswitch-lts-pin
 
 # Whether to disable repositories in /etc/apt/sources.list. This may be used
 # when replacing the distribution repositories via apt_repositories.

etc/kayobe/kolla.yml

@@ -134,24 +134,14 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/magnum.git
     reference: stackhpc/{{ openstack_release }}
-  neutron-base-plugin-networking-generic-switch:
-    type: git
-    location: https://github.com/stackhpc/networking-generic-switch.git
-    reference: stackhpc/{{ openstack_release }}
-  # FIXME: check whether we want to build from upstream master of a downstream
-  # 2025.1 branch e.g.
-  # location: https://github.com/stackhpc/networking-mlnx.git
-  # reference: stackhpc/{{ openstack_release }}
   neutron-server-plugin-networking-mlnx:
     type: git
-    location: https://opendev.org/x/networking-mlnx
-    reference: master
+    location: https://github.com/stackhpc/networking-mlnx.git
+    reference: stackhpc/{{ openstack_release }}
   nova-compute-plugin-networking-mlnx:
     type: git
-    location: https://opendev.org/x/networking-mlnx
-    reference: master
-  # FIXME: Check whether we want to build from downstream stackhpc/master,
-  # stackhpc/2025.1, or upstream epoxy or master
+    location: https://github.com/stackhpc/networking-mlnx.git
+    reference: stackhpc/{{ openstack_release }}
   blazar-base:
     type: git
     location: https://github.com/stackhpc/blazar.git
@@ -360,7 +350,6 @@ kolla_build_customizations_common:
     - python3-ethtool
   neutron_mlnx_agent_pip_packages_override:
     - networking-mlnx@git+https://opendev.org/x/networking-mlnx@master
-
 kolla_build_customizations_rocky:
   base_centos_yum_repo_packages_append:
     - centos-release-ceph-squid
@@ -369,6 +358,10 @@ kolla_build_customizations_rocky:
   base_centos_yum_repos_to_disable_remove:
     - centos-ceph-reef
     - epel
+    - centos9-nfv-ovs
+    - centos9-opstools
+    - centos9-rabbitmq
+    - centos9-storage
   kolla_toolbox_packages_remove:
     - openvswitch
   kolla_toolbox_packages_append:
@@ -389,6 +382,8 @@ kolla_build_customizations_rocky:
   nova_base_packages_append:
     - openvswitch3.3
     - python3-openvswitch3.3
+  nova_libvirt_packages_remove:
+    - openvswitch
   octavia_base_packages_remove:
     - python3-openvswitch
   openvswitch_base_packages_remove:

etc/kayobe/kolla/kolla-build.conf

@@ -4,9 +4,11 @@
 {# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
 {% if kolla_base_distro == 'ubuntu' %}
 base_tag = noble-20241118.1
+apt_preferences = /home/runner/_work/stackhpc-kayobe-config/stackhpc-kayobe-config/stackhpc-apt-preferences
 {# Similarly pinning to Rocky 9 minor version used in our repos #}
 {% elif kolla_base_distro == 'rocky' %}
 base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
+rpm_setup_config = 
 {% endif %}
 build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | join(',') }}
 

etc/kayobe/pulp-repo-versions.yml

@@ -17,7 +17,7 @@ stackhpc_pulp_repo_rhel_9_influxdb_version: 20250125T002237
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250205T001351
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
-stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241115T002028
+stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20250516T002449
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328

etc/kayobe/stackhpc.yml

@@ -141,7 +141,10 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/20.0.0.3
+# FIXME: Go back to normal tags once
+# https://review.opendev.org/c/openstack/kolla/+/951871 is merged and synced
+# downstream
+stackhpc_kolla_source_version: epoxy-test-alex
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

releasenotes/notes/ovs-3.3-46e7e524eabe0246.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    OpenvSwitch has been pinned to the latest LTS release (3.3) in Ubuntu
+    Noble container images.