[debian] Use upstream MariaDB

This preserves the Debian-provided minor version - 10.5 in case
of Bullseye in Wallaby and Xena - and is backported as
a fix to Victoria and Ussuri (where it follows Buster and its
10.3).

Closes-Bug: #1944410
Change-Id: I9704e5371a410cb1f69ec0367174e2b368961dc1
(cherry picked from commit b5422a6bc2)

docker/base/Dockerfile.j2

@@ -375,6 +375,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      'F1656F24C74CD1D8',
       'F77F1EDA57EBB1CC',
       'F6609E60DC62814E',
     ] %}

kolla/template/repos.yaml

@@ -54,6 +54,7 @@ debian:
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
   td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib"
 
@@ -65,6 +66,7 @@ debian-aarch64:
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
+  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
 
 ubuntu:

releasenotes/notes/debian-mariadb-upstream-75e05cbdaa013abe.yaml

@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    Debian now uses upstream MariaDB repos (thus following Ubuntu
+    images). This is done to avoid issues like the related one and
+    have an easy workaround of pinning to chosen MariaDB version if
+    need arises.
+    Operators may want to reflect this in their repo mirrors and
+    proxies.
+    `LP#1944410 <https://launchpad.net/bugs/1944410>`__