openstack
/
kolla
Code Issues Proposed changes

mariadb: Bump to current LTS (10.11) 

Depends-On: I2189dafca070accfd8efcd4b8cc4221c6decdc9f
Change-Id: I849608a8b90f48912e102ddab395b1a229346c5a
This commit is contained in:
Michal Nasiadka 2023-05-11 11:03:26 +02:00
parent b33167972d
commit 05f6fe8c30
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/contributor/versions.rst
View File

@ -19,7 +19,7 @@ information about package sources.
InfluxDB 1.8.x `InfluxDB upstream repo`_
Kibana 7.x `Kibana install guide`_
Logstash 7.x `Logstash install guide`_
MariaDB 10.6 (LTS) `MariaDB Community downloads`_
MariaDB 10.11 (LTS) `MariaDB Community downloads`_
Galera 26.4 (LTS) `MariaDB Community downloads`_
Opensearch 2.5.x `Opensearch install guide`_
ProxySQL 2.4.x `ProxySQL repository`_

2
docker/base/mariadb.repo
View File

@ -1,6 +1,6 @@
[mariadb]
name = MariaDB Server
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/$releasever/$basearch
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch
gpgcheck = 1
enabled = 0
module_hotfixes = 1

3
docker/mariadb/mariadb-base/Dockerfile.j2
View File

@ -24,8 +24,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(mariadb_base_packages | customizable("packages")) }}
{# NOTE(mnasiadka): Latest clustercheck version as of May 2023 is 10.9 #}
{% block mariadb_clustercheck_version %}
ARG mariadb_clustercheck_version=10.6
ARG mariadb_clustercheck_version=10.9
ARG mariadb_clustercheck_url=https://src.fedoraproject.org/rpms/mariadb/raw/${mariadb_clustercheck_version}/f/clustercheck.sh
{% endblock %}

8
kolla/template/repos.yaml
View File

@ -52,7 +52,7 @@ debian:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
suite: "bullseye"
component: "main"
gpg_key: "mariadb.gpg"
@ -99,7 +99,7 @@ debian-aarch64:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
suite: "bullseye"
component: "main"
gpg_key: "mariadb.gpg"
@ -182,7 +182,7 @@ ubuntu:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "mariadb.gpg"
@ -229,7 +229,7 @@ ubuntu-aarch64:
component: "stable"
gpg_key: "influxdb.asc"
mariadb:
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "mariadb.gpg"