From 9e36b8976657e5aaf285f4ab9f65603ab475fd89 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 20 May 2025 09:21:59 +0000 Subject: 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 --- docker/mariadb/mariadb-base/Dockerfile.j2 | 4 ++-- docker/mariadb/mariadb-server/Dockerfile.j2 | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docker/mariadb') diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index e4e17a8bf..ddf6d50d9 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/docker/mariadb/mariadb-base/Dockerfile.j2 @@ -9,14 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} -{{ macros.enable_extra_repos(['mariadb']) }} - +{# NOTE(mnasiadka): Using AppStream packages on CS10 for now #} {% if base_package_type == 'rpm' %} {% set mariadb_base_packages = [ 'mariadb', ] %} {% elif base_package_type == 'deb' %} +{{ macros.enable_extra_repos(['mariadb']) }} {% set mariadb_base_packages = [ 'mariadb-client', ] %} diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2 index ec17a5055..55dd8b5b6 100644 --- a/docker/mariadb/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb/mariadb-server/Dockerfile.j2 @@ -10,13 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='mysql') }} {# NOTE(mgoddard): EPEL required for pv package #} -{{ macros.enable_extra_repos(['epel', 'mariadb']) }} +{# NOTE(mnasiadka): Use AppStream version of MariaDB for now in CentOS #} +{{ macros.enable_extra_repos(['epel']) }} {% if base_package_type == 'rpm' %} {% set mariadb_packages = [ 'expect', 'mariadb-backup', 'mariadb-server', + 'mariadb-server-galera', 'pv', 'rsync', 'tar' @@ -26,6 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera {% elif base_package_type == 'deb' %} +{{ macros.enable_extra_repos(['mariadb']) }} {% set mariadb_packages = [ 'expect', 'mariadb-backup', -- cgit v1.2.3