Merge "[debian] Use upstream MariaDB" into stable/wallaby

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

@@ -65,6 +65,7 @@ debian:
   influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
+  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian bullseye main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ bullseye main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/bullseye bullseye contrib"
 
@@ -75,6 +76,7 @@ debian-aarch64:
   influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
+  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian bullseye main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ bullseye main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/bullseye bullseye contrib"
 

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>`__