diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-05-20 09:21:59 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-07-16 14:05:50 +0000 |
| commit | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (patch) | |
| tree | 7d7f24ee6412f50116a9684bd09e0bbba7ba867e /kolla | |
| parent | a90a8893c8df1eed8d8409c70bd8177392290554 (diff) | |
| download | kolla-9e36b8976657e5aaf285f4ab9f65603ab475fd89.tar.gz kolla-9e36b8976657e5aaf285f4ab9f65603ab475fd89.zip | |
Move to CentOS Stream 10
Known missing packages:
- mod_auth_mellon - missing SAML support in Keystone/Horizon - built in Kolla COPR
- glusterfs-fuse in manila-share - built in Kolla COPR
- collectd/telegraf - no opstools repository
- redis - needs a switch to valkey
- python3-ethtool - not required for neutron-mlnx-agent since 6 years [1]
Building packages in Kolla COPR is a temporary solution until these show up
in EPEL10.
[1]: Id2cae3ac9ff049e9fc8225551f99e1e99a87fc65
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/951751
Change-Id: I7074fabcf95184fcfd2561648ae1e05acfb0bc11
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 6 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 3 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 6 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 6038a2dbe..545260076 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -25,14 +25,14 @@ BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu'] BASE_ARCH = ['x86_64', 'aarch64'] DEBIAN_ARCH = ['amd64', 'arm64'] DEFAULT_BASE_TAGS = { - 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'}, + 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream10'}, 'debian': {'name': 'debian', 'tag': 'bookworm'}, 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'}, 'ubuntu': {'name': 'ubuntu', 'tag': '24.04'}, } # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release DISTRO_PRETTY_NAME = { - 'centos': 'CentOS Stream 9', + 'centos': 'CentOS Stream 10', 'debian': 'Debian GNU/Linux 12 (bookworm)', 'rocky': 'Rocky Linux 9.* (Blue Onyx)', 'ubuntu': 'Ubuntu 24.04.* LTS', @@ -40,7 +40,7 @@ DISTRO_PRETTY_NAME = { OPENSTACK_RELEASE = '2025.1' # This is noarch repository so we will use it on all architectures -DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \ +DELOREAN_DEPS = "https://trunk.rdoproject.org/centos10-master/" \ "delorean-deps.repo" # TODO(mandre) check for file integrity instead of downloading from an HTTPS diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 826316c26..71c053731 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -23,10 +23,13 @@ UNBUILDABLE_IMAGES = { # Issues for SHA1 keys: # https://github.com/grafana/grafana/issues/41036 'centos': { + "collectd", # CS10 no opstools repo "hacluster-pcs", # Missing crmsh package "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 }, 'debian': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index d0bfed99f..a72e734ce 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -1,6 +1,6 @@ --- centos: - ceph: "centos-ceph-reef" + ceph: "centos-ceph-squid" crb: "crb" docker-ce: "docker-ce" epel: "epel" @@ -10,6 +10,7 @@ centos: grafana: "grafana" hacluster: "highavailability" influxdb: "influxdb" + kolla_el10: "kolla_el10" mariadb: "mariadb" opensearch: "opensearch-3.x" opensearch-dashboards: "opensearch-dashboards-3.x" @@ -19,7 +20,7 @@ centos: rabbitmq: "rabbitmq_rabbitmq-server" centos-aarch64: - ceph: "centos-ceph-reef" + ceph: "centos-ceph-squid" crb: "crb" docker-ce: "docker-ce" epel: "epel" @@ -29,6 +30,7 @@ centos-aarch64: grafana: "grafana" hacluster: "highavailability" influxdb: "influxdb" + kolla_el10: "kolla_el10" mariadb: "mariadb" opensearch: "opensearch-3.x" opensearch-dashboards: "opensearch-dashboards-3.x" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index afa21e2ab..395dadd4e 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -55,7 +55,7 @@ class MethodsTest(base.TestCase): result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'enable') expectCmd = 'RUN dnf config-manager --enable grafana ' - expectCmd += '--enable centos-ceph-reef || true' + expectCmd += '--enable centos-ceph-squid || true' self.assertEqual(expectCmd, result) def test_enable_repos_debian(self): @@ -167,7 +167,7 @@ class MethodsTest(base.TestCase): result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'disable') expectCmd = 'RUN dnf config-manager --disable grafana ' - expectCmd += '--disable centos-ceph-reef || true' + expectCmd += '--disable centos-ceph-squid || true' self.assertEqual(expectCmd, result) # NOTE(hrw): there is no disabling of repos for Debian/Ubuntu |
