Skip to content

Commit d4b777b

Browse files
mnasiadkamnasiadka
committed
Move to Rocky Linux 10
Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/961237 Change-Id: Idd809f5efd2d308c1565d7635e67af0a431d18f7 Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 8b12152 commit d4b777b

File tree

13 files changed

+112
-66
lines changed

13 files changed

+112
-66
lines changed

‎doc/source/ceph_versions.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Distro,Ceph,
22
,Source, Release
3-
Rocky Linux,CentOS Storage SIG,Reef
3+
Rocky Linux,CentOS Storage SIG,Squid
44
Ubuntu,Ubuntu,Squid
55
Debian,Debian,Pacific

‎doc/source/contributor/versions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ For each component used we list version used at branch release and provide
1010
information about package sources.
1111

1212
.. note::
13-
When table mentions 'CentOS' it means both CentOS Stream 9 and Rocky Linux 9.
13+
When table mentions 'CentOS' it means both CentOS Stream 10 and Rocky Linux 10.
1414

1515
============== ================ =============================================
1616
Name Version Package source information

‎doc/source/support_matrix.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following base container images are supported:
1717
================== =============================== ================
1818
Distribution Default base Default base tag
1919
================== =============================== ================
20-
Rocky Linux quay.io/rockylinux/rockylinux 9
20+
Rocky Linux quay.io/rockylinux/rockylinux 10
2121
Debian Bookworm debian bookworm
2222
Ubuntu Noble ubuntu 24.04
2323
================== =============================== ================

‎docker/base/Dockerfile.j2‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
164164
{% block base_centos_repo_overrides_post_yum %}{% endblock -%}
165165
&& {{ macros.rpm_security_update(clean_package_cache) }}
166166

167+
{# NOTE(mnasiadka): dumb-init is only in EPEL10.1 onwards and RHEL/Rocky/clones use the same #}
168+
{# EPEL release as the installed distro release #}
169+
{# TODO: Remove it when Rocky 10.1 is out #}
170+
RUN dnf config-manager --save --setopt=*.metalink="https://mirrors.fedoraproject.org/metalink?repo=epel-z-10.1&arch=\$basearch" epel
171+
167172
#### END REPO ENABLEMENT
168173

169174
{# We are back to the basic if conditional here which is:
@@ -183,6 +188,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
183188
'lsof',
184189
'lvm2',
185190
'ncurses',
191+
'openssl',
186192
'procps-ng',
187193
'python3',
188194
'python3-pip',

‎docker/base/ci-rocky.repo‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎kolla/common/config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
DEFAULT_BASE_TAGS = {
2828
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream10'},
2929
'debian': {'name': 'debian', 'tag': 'bookworm'},
30-
'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'},
30+
'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '10'},
3131
'ubuntu': {'name': 'ubuntu', 'tag': '24.04'},
3232
}
3333
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
3434
DISTRO_PRETTY_NAME = {
3535
'centos': 'CentOS Stream 10',
3636
'debian': 'Debian GNU/Linux 12 (bookworm)',
37-
'rocky': 'Rocky Linux 9.* (Blue Onyx)',
37+
'rocky': 'Rocky Linux 10.* (Red Quartz)',
3838
'ubuntu': 'Ubuntu 24.04.* LTS',
3939
}
4040
OPENSTACK_RELEASE = '2025.2'

‎kolla/image/unbuildable.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"nova-spicehtml5proxy", # Missing spicehtml5 package
2828
"ovsdpdk", # Not supported on CentOS
2929
"redis-base", # Missing in CS10
30-
"tgtd", # Not supported on CentOS
3130
"telegraf", # CS10 no opstools repo
31+
"tgtd", # Not supported on CentOS
3232
},
3333

3434
'debian': {
@@ -41,6 +41,8 @@
4141
"hacluster-pcs", # Missing crmsh package
4242
"nova-spicehtml5proxy", # Missing spicehtml5 package
4343
"ovsdpdk", # Not supported on CentOS
44+
"redis-base", # Missing in Rocky10
45+
"telegraf", # CS10 no opstools repo
4446
"tgtd", # Not supported on CentOS
4547
},
4648

‎kolla/template/repos.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ debian-aarch64:
150150
gpg_key: "rabbitmq.gpg"
151151

152152
rocky:
153-
ceph: "centos-ceph-reef"
153+
ceph: "centos-ceph-squid"
154154
crb: "crb"
155155
docker-ce: "docker-ce"
156156
epel: "epel"
@@ -160,6 +160,7 @@ rocky:
160160
grafana: "grafana"
161161
hacluster: "highavailability"
162162
influxdb: "influxdb"
163+
kolla_el10: "kolla_el10"
163164
mariadb: "mariadb"
164165
opensearch: "opensearch-3.x"
165166
opensearch-dashboards: "opensearch-dashboards-3.x"
@@ -169,7 +170,7 @@ rocky:
169170
rabbitmq: "rabbitmq_rabbitmq-server"
170171

171172
rocky-aarch64:
172-
ceph: "centos-ceph-reef"
173+
ceph: "centos-ceph-squid"
173174
crb: "crb"
174175
docker-ce: "docker-ce"
175176
epel: "epel"
@@ -178,6 +179,7 @@ rocky-aarch64:
178179
fluentd: "fluent-package-lts"
179180
grafana: "grafana"
180181
influxdb: "influxdb"
182+
kolla_el10: "kolla_el10"
181183
hacluster: "highavailability"
182184
mariadb: "mariadb"
183185
opensearch: "opensearch-3.x"

‎releasenotes/notes/rocky-10-4111fa0160be14ab.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
features:
3+
- |
4+
Adds support for Rocky 10 as a base container image. This is the only major
5+
version of Rocky supported from the 2025.2 release.
6+
upgrade:
7+
- |
8+
Rocky 9 is no longer supported as a base container image. Rocky users
9+
should migrate to Rocky 10.
10+
- |
11+
The following images were supported by Rocky 9 but lack suitable packages
12+
in Rocky, and are no longer supported for Rocky: ``telegraf``.

‎tests/templates/template_overrides.j2‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,14 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
1919
{% endraw %}
2020

2121
{% if base_distro == 'rocky' %}
22-
{#
23-
NOTE(hrw): Rocky is not mirrored but it uses CentOS repos which are
24-
#}
2522
{% raw %}
2623
{% block base_centos_repo_overrides_post_copy %}
2724
{% endraw %}
28-
29-
COPY ci-rocky.repo /etc/yum.repos.d/
30-
RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \
31-
&& sed -i -e "s/MIRROR/{{ nodepool_mirror_host }}/g" /etc/yum.repos.d/ci-rocky.repo
32-
25+
RUN sed -i -e "s/^mirrorlist/#mirrorlist/g" -e "s/^#baseurl/baseurl/g" \
26+
/etc/yum.repos.d/rocky.repo
3327
{% raw %}
3428
{% endblock %}
3529
{% endraw %}
36-
37-
{% raw %}
38-
39-
{% block base_centos_repo_overrides_post_yum -%}
40-
{%- endraw -%}
41-
&& cd /etc/yum.repos.d/ && mv CentOS*.repo epel*.repo not-for-ci/
42-
{%- raw -%}
43-
{% endblock %}
44-
{% endraw %}
4530
{% endif %}
4631

4732
{% raw %}

0 commit comments

Comments
 (0)