diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-08-05 14:24:11 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-01 12:39:22 +0000 |
| commit | d4b777bb060517dbb0b648d5d7d5c07336969866 (patch) | |
| tree | 1e5c4965b515d2f992cafa174e03ea30efa99f0d /kolla | |
| parent | 8b121529cbcfeb20f75114873b0d2b46ffde1e68 (diff) | |
| download | kolla-d4b777bb060517dbb0b648d5d7d5c07336969866.tar.gz kolla-d4b777bb060517dbb0b648d5d7d5c07336969866.zip | |
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 <mnasiadka@gmail.com>
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index d2984d7ec..83b0cb922 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -27,14 +27,14 @@ DEBIAN_ARCH = ['amd64', 'arm64'] DEFAULT_BASE_TAGS = { 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream10'}, 'debian': {'name': 'debian', 'tag': 'bookworm'}, - 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'}, + 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '10'}, 'ubuntu': {'name': 'ubuntu', 'tag': '24.04'}, } # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release DISTRO_PRETTY_NAME = { 'centos': 'CentOS Stream 10', 'debian': 'Debian GNU/Linux 12 (bookworm)', - 'rocky': 'Rocky Linux 9.* (Blue Onyx)', + 'rocky': 'Rocky Linux 10.* (Red Quartz)', 'ubuntu': 'Ubuntu 24.04.* LTS', } OPENSTACK_RELEASE = '2025.2' diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index c426b3eab..997b4b86b 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -27,8 +27,8 @@ UNBUILDABLE_IMAGES = { "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS "redis-base", # Missing in CS10 - "tgtd", # Not supported on CentOS "telegraf", # CS10 no opstools repo + "tgtd", # Not supported on CentOS }, 'debian': { @@ -41,6 +41,8 @@ UNBUILDABLE_IMAGES = { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS + "redis-base", # Missing in Rocky10 + "telegraf", # CS10 no opstools repo "tgtd", # Not supported on CentOS }, diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a72e734ce..f45ecb3aa 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -150,7 +150,7 @@ debian-aarch64: gpg_key: "rabbitmq.gpg" rocky: - ceph: "centos-ceph-reef" + ceph: "centos-ceph-squid" crb: "crb" docker-ce: "docker-ce" epel: "epel" @@ -160,6 +160,7 @@ rocky: grafana: "grafana" hacluster: "highavailability" influxdb: "influxdb" + kolla_el10: "kolla_el10" mariadb: "mariadb" opensearch: "opensearch-3.x" opensearch-dashboards: "opensearch-dashboards-3.x" @@ -169,7 +170,7 @@ rocky: rabbitmq: "rabbitmq_rabbitmq-server" rocky-aarch64: - ceph: "centos-ceph-reef" + ceph: "centos-ceph-squid" crb: "crb" docker-ce: "docker-ce" epel: "epel" @@ -178,6 +179,7 @@ rocky-aarch64: fluentd: "fluent-package-lts" grafana: "grafana" influxdb: "influxdb" + kolla_el10: "kolla_el10" hacluster: "highavailability" mariadb: "mariadb" opensearch: "opensearch-3.x" |