Merge "Move to CentOS Stream 10"

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