Skip to content

Commit d737b56

Browse files
committed
Pin OVN to 24.03 on Ubuntu Noble
1 parent 17b6c17 commit d737b56

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

etc/kayobe/apt.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ apt_repositories: "{{ stackhpc_apt_repositories | selectattr('required') | list
7676
# * filename: name of a file in /etc/apt/preferences.d/ in which to write
7777
# the configuration
7878
# Default is an empty list.
79-
apt_preferences:
80-
- content: |
81-
Package: openvswitch-switch openvswitch-common openvswitch-common-dpdk
82-
Pin: version 3.3.*
83-
Pin-Priority: 1001
84-
filename: stackhpc-openvswitch-lts-pin
79+
#apt_preferences:
8580

8681
# Whether to disable repositories in /etc/apt/sources.list. This may be used
8782
# when replacing the distribution repositories via apt_repositories.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Custom APT preferences for Ubuntu-based kolla container image builds
2+
# Pin openvswitch packages to 3.3 (latest LTS release)
3+
Package: openvswitch-* python3-openvswitch
4+
Pin: version 3.3.*
5+
Pin-Priority: 1001
6+
7+
# Pin OVN packages to 24.03 (latest LTS release)
8+
Package: ovn-*
9+
Pin: version 24.03.*
10+
Pin-Priority: 1001

etc/kayobe/kolla/kolla-build.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
{# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
55
{% if kolla_base_distro == 'ubuntu' %}
66
base_tag = noble-20241118.1
7-
apt_preferences = /home/runner/_work/stackhpc-kayobe-config/stackhpc-kayobe-config/stackhpc-apt-preferences
7+
apt_preferences = /home/runner/_work/stackhpc-kayobe-config/stackhpc-kayobe-config/etc/kayobe/environments/ci-builder/builder-apt-preferences
88
{# Similarly pinning to Rocky 9 minor version used in our repos #}
99
{% elif kolla_base_distro == 'rocky' %}
1010
base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
11+
# NOTE(Alex-Welsh): rpm_setup_config is intentionally left blank to override defaults
1112
rpm_setup_config =
1213
{% endif %}
1314
build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | join(',') }}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
OVN has been pinned to the latest LTS release (24.03) in Ubuntu
5+
Noble container images.

0 commit comments

Comments
 (0)