From b8b181a0603ce799fa447c713afb0dfedfc3592a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sat, 25 Sep 2021 19:46:55 +0000
Subject: [PATCH] Use MariaDB 10.6

As planned for Yoga.

Change-Id: Ibcfbaa1903c7059e437bb2118bc4c9de4a9b854e
---
 docker/base/mariadb-aarch64.repo                      | 2 +-
 docker/base/mariadb.repo                              | 2 +-
 kolla/template/repos.yaml                             | 8 ++++----
 releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml | 4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml

diff --git a/docker/base/mariadb-aarch64.repo b/docker/base/mariadb-aarch64.repo
index 7f7a1c8b1b..b00cbbde07 100644
--- a/docker/base/mariadb-aarch64.repo
+++ b/docker/base/mariadb-aarch64.repo
@@ -1,6 +1,6 @@
 [mariadb]
 name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-aarch64
+baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-aarch64
 module_hotfixes = 1
 gpgcheck = 1
 enabled = 0
diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo
index 9fbdd12ee0..be96b44ae6 100644
--- a/docker/base/mariadb.repo
+++ b/docker/base/mariadb.repo
@@ -1,6 +1,6 @@
 [mariadb]
 name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-amd64
+baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-amd64
 module_hotfixes = 1
 gpgcheck = 1
 enabled = 0
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 465139e2f4..d66df8241f 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -75,7 +75,7 @@ debian:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -128,7 +128,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -185,7 +185,7 @@ ubuntu:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -237,7 +237,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"
diff --git a/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml b/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml
new file mode 100644
index 0000000000..99602f1b76
--- /dev/null
+++ b/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Images now have MariaDB 10.6.