Skip to content

Commit e647aa1

Browse files
authored
Merge pull request #1172 from stackhpc/ovn_24_03
rocky: update ovn to 24.03 (LTS) and OVS to 3.3
2 parents 0d64e97 + 3f1e622 commit e647aa1

File tree

3 files changed

+48
-5
lines changed

3 files changed

+48
-5
lines changed

etc/kayobe/kolla-image-tags.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ kolla_image_tags:
1414
ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
1515
haproxy_ssh:
1616
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
17+
kolla_toolbox:
18+
rocky-9: 2023.1-rocky-9-20240809T102431
1719
letsencrypt:
1820
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
21+
manila:
22+
rocky-9: 2023.1-rocky-9-20240809T102431
23+
neutron:
24+
rocky-9: 2023.1-rocky-9-20240809T102431
1925
nova:
2026
rocky-9: 2023.1-rocky-9-20240723T140948
2127
ubuntu-jammy: 2023.1-ubuntu-jammy-20240723T140948
@@ -24,3 +30,7 @@ kolla_image_tags:
2430
ubuntu-jammy: 2023.1-ubuntu-jammy-20240730T090421
2531
opensearch:
2632
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444
33+
openvswitch:
34+
rocky-9: 2023.1-rocky-9-20240809T102431
35+
ovn:
36+
rocky-9: 2023.1-rocky-9-20240809T102431

etc/kayobe/kolla.yml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,16 +441,44 @@ kolla_build_customizations_common:
441441
- /additions/*
442442

443443
kolla_build_customizations_rocky:
444+
kolla_toolbox_packages_remove:
445+
- openvswitch
446+
kolla_toolbox_packages_append:
447+
- openvswitch3.3
448+
manila_base_packages_remove:
449+
- openvswitch
450+
manila_base_packages_append:
451+
- openvswitch3.3
452+
neutron_base_packages_remove:
453+
- openvswitch
454+
- python3-openvswitch
455+
neutron_base_packages_append:
456+
- openvswitch3.3
457+
- python3-openvswitch3.3
458+
nova_base_packages_remove:
459+
- openvswitch
460+
- python3-openvswitch
461+
nova_base_packages_append:
462+
- openvswitch3.3
463+
- python3-openvswitch3.3
464+
octavia_base_packages_remove:
465+
- python3-openvswitch
466+
openvswitch_base_packages_remove:
467+
- openvswitch
468+
- python3-openvswitch
469+
openvswitch_base_packages_append:
470+
- openvswitch3.3
471+
- python3-openvswitch3.3
444472
ovn_base_packages_override:
445-
- ovn23.03
473+
- ovn24.03
446474
ovn_controller_packages_override:
447-
- ovn23.03-host
475+
- ovn24.03-host
448476
ovn_nb_db_server_packages_override:
449-
- ovn23.03-central
477+
- ovn24.03-central
450478
ovn_northd_packages_override:
451-
- ovn23.03-central
479+
- ovn24.03-central
452480
ovn_sb_db_server_packages_override:
453-
- ovn23.03-central
481+
- ovn24.03-central
454482

455483
kolla_build_customizations_ubuntu: {}
456484

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
``OVN`` version in Rocky Linux 9 container images has been updated to
5+
``24.03`` (latest LTS).

0 commit comments

Comments
 (0)