Skip to content

WIP adding Rocky Linux 9.6 support #1742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: stackhpc/2024.1
Choose a base branch
from
Open

WIP adding Rocky Linux 9.6 support #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
095ccbb
adding rl9.6
GregWhiteyBialas Jun 27, 2025
12d9834
backporting skyline disable
seunghun1ee Jun 10, 2025
a3cbe38
linter
GregWhiteyBialas Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion etc/kayobe/environments/ci-builder/stackhpc-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ kolla_enable_octavia: true
kolla_enable_opensearch: true
kolla_enable_prometheus: true
kolla_enable_redis: true
kolla_enable_skyline: true
kolla_build_neutron_ovs: true

###############################################################################
Expand Down
26 changes: 1 addition & 25 deletions etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,50 @@
# where the key is the OS distro and the value is the tag to deploy.
kolla_image_tags:
openstack:
rocky-9: 2024.1-rocky-9-20241218T141751
rocky-9: 2024.1-rocky-9-20250704T120124
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
bifrost:
rocky-9: 2024.1-rocky-9-20250325T141125
ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
glance:
rocky-9: 2024.1-rocky-9-20250213T103134
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
horizon:
rocky-9: 2024.1-rocky-9-20250227T091118
ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118
ironic:
rocky-9: 2024.1-rocky-9-20250213T110505
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505
ironic_dnsmasq:
rocky-9: 2024.1-rocky-9-20241218T141751
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
ironic_prometheus_exporter:
rocky-9: 2024.1-rocky-9-20250124T081816
ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
kolla_toolbox:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
magnum:
rocky-9: 2024.1-rocky-9-20250522T143506
ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
manila:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
neutron:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
neutron_bgp_dragent:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
nova:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
octavia:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
openvswitch:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
ovn:
rocky-9: 2024.1-rocky-9-20250529T081147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
prometheus:
rocky-9: 2024.1-rocky-9-20250219T145255
ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255
prometheus_alertmanager:
rocky-9: 2024.1-rocky-9-20250422T103147
ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147
skyline_apiserver:
rocky-9: 2024.1-rocky-9-20250408T133253
ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253
ubuntu-noble: 2024.1-ubuntu-noble-20250415T123136
skyline_console:
rocky-9: 2024.1-rocky-9-20250408T133253
ubuntu-jammy: 2024.1-ubuntu-jammy-20250408T133253
ubuntu-noble: 2024.1-ubuntu-noble-20250415T123136
8 changes: 8 additions & 0 deletions etc/kayobe/kolla/kolla-build.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,11 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo
type = git
location = https://github.com/stackhpc/requirements
reference = stackhpc/{{ openstack_release }}

[etcd]
version = 3.5.21
sha256 = amd64:adddda4b06718e68671ffabff2f8cee48488ba61ad82900e639d108f2148501c,arm64:95bf6918623a097c0385b96f139d90248614485e781ec9bee4768dbb6c79c53f

[letsencrypt-lego]
version = v4.23.1
sha256 = amd64:1fd60b1fd59c239bed22719a5de402cb745d1f933540cb1ec196e2c03e6e8882,arm64:1114745108343286d4bff189b4bdee3cba9d07ebcacc673860d91ab951d31e0d
19 changes: 14 additions & 5 deletions etc/kayobe/pulp-repo-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240923T233036
stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20241218T154614
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250401T001425
stackhpc_pulp_repo_elrepo_9_version: 20241129T235743
stackhpc_pulp_repo_epel_9_version: 20241216T235733
stackhpc_pulp_repo_grafana_version: 20241216T002739
stackhpc_pulp_repo_opensearch_2_x_version: 20241106T010702
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20241106T010702
stackhpc_pulp_repo_elrepo_9_version: 20250610T235426
stackhpc_pulp_repo_epel_9_version: 20250615T000221
stackhpc_pulp_repo_grafana_version: 20250615T005738
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241217T002152
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
stackhpc_pulp_repo_rhel_9_influxdb_version: 20241217T002152
Expand Down Expand Up @@ -47,6 +47,11 @@ stackhpc_pulp_repo_rocky_9_5_crb_version: 20241217T005008
stackhpc_pulp_repo_rocky_9_5_extras_version: 20241216T004230
stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20241202T003154
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241127T003858
stackhpc_pulp_repo_rocky_9_6_appstream_version: 20250614T015933
stackhpc_pulp_repo_rocky_9_6_baseos_version: 20250614T030644
stackhpc_pulp_repo_rocky_9_6_crb_version: 20250614T015933
stackhpc_pulp_repo_rocky_9_6_extras_version: 20250605T150141
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250416T042645
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250417T070229
stackhpc_pulp_repo_ubuntu_jammy_version: 20250417T070229
Expand All @@ -56,3 +61,7 @@ stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
##### NOTE: Dummy variables, currently no RL9.6 DOCA
stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000
stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000
######
6 changes: 2 additions & 4 deletions etc/kayobe/pulp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ stackhpc_pulp_distribution_deb_production: >-

# Whether to sync Rocky Linux 9 packages.
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5. Default is 5
stackhpc_pulp_repo_rocky_9_minor_version: 5
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5, 6. Default is 6
stackhpc_pulp_repo_rocky_9_minor_version: 6
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
# pulp-repo-versions.yml for the selected minor release.
stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
Expand Down Expand Up @@ -585,8 +585,6 @@ stackhpc_pulp_images_kolla:
- rabbitmq
- redis
- redis-sentinel
- skyline-apiserver
- skyline-console

# List of images for each base distribution which should not/cannot be built.
stackhpc_kolla_unbuildable_images:
Expand Down
27 changes: 25 additions & 2 deletions etc/kayobe/trivy/allowed-vulnerabilities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,31 @@ fluentd_allowed_vulnerabilities:
- CVE-2024-27280
grafana_allowed_vulnerabilities:
- CVE-2024-8986
skyline_apiserver_allowed_vulnerabilities:
- CVE-2024-33663
influxdb_allowed_vulnerabilities:
- CVE-2024-45337
magnum_conductor_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_blackbox_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_memcached_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_mysqld_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_elasticsearch_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_node_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_openstack_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_libvirt_exporter_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_cadvisor_allowed_vulnerabilities:
- CVE-2024-41110
- CVE-2024-45337
prometheus_msteams_allowed_vulnerabilities:
- CVE-2024-45337
prometheus_v2_server_allowed_vulnerabilities:
- CVE-2024-45337

###############################################################################
# Dummy variable to allow Ansible to accept this file.
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/drop-skyline-support-31d683f58f125335.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
deprecations:
- |
Disabled building of Kolla container images for Skyline
5 changes: 0 additions & 5 deletions releasenotes/notes/enable-building-skyline-61a41c13cfcd54a1.yaml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions releasenotes/notes/rl9.6-f46ea1230214a657.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
features:
- |
Added support for Rocky Linux 9.6, including host packages and a full
container image refresh.
upgrade:
- |
9.6 is now the default release for Rocky Linux.
Loading