Use apt-preferences to pin openvswitch==3.3

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 > /etc/apt/preferences.d/stackhpc-apt-preferences <<EOF
+            Package: openvswitch-switch openvswitch-common openvswitch-common-dpdk
+            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

@@ -403,55 +403,7 @@ kolla_build_customizations_rocky:
   ovn_sb_db_server_packages_override:
     - ovn24.03-central
 
-kolla_build_customizations_ubuntu:
-  kolla_toolbox_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-  kolla_toolbox_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-  manila_base_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-  manila_base_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-  neutron_base_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-    - python3-openvswitch
-  neutron_base_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-    - python3-openvswitch=3.3.0-1ubuntu3.2
-  nova_base_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-    - python3-openvswitch
-  nova_base_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-    - python3-openvswitch=3.3.0-1ubuntu3.2
-  nova_libvirt_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-  nova_libvirt_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-  openvswitch_base_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common
-    - python3-openvswitch
-  openvswitch_base_packages_append:
-    - openvswitch-switch=3.3.0-1ubuntu3.2
-    - openvswitch-common=3.3.0-1ubuntu3.2
-    - python3-openvswitch=3.3.0-1ubuntu3.2
-  ovs_dpdk_packages_remove:
-    - openvswitch-switch
-    - openvswitch-common-dpdk
-  ovs_dpdk_packages_append:
-    - openvswitch-switch-dpdk=3.3.0-1ubuntu3.2
-
+kolla_build_customizations_ubuntu: {}
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:

etc/kayobe/kolla/kolla-build.conf

@@ -4,6 +4,7 @@
 {# 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 = /etc/apt/preferences.d/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 }}