From b5422a6bc27797144da1ea973cec24a5cf46d2eb Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Tue, 21 Sep 2021 07:40:58 +0000 Subject: [debian] Use upstream MariaDB This preserves the Debian-provided minor version - 10.5 in case of Bullseye in Wallaby and Xena - and will be backported as a fix to Victoria and Ussuri (where it will follow Buster and its 10.3). Related-Bug: #1944410 Change-Id: I9704e5371a410cb1f69ec0367174e2b368961dc1 --- kolla/template/repos.yaml | 10 ++++++++++ .../notes/debian-mariadb-upstream-75e05cbdaa013abe.yaml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/debian-mariadb-upstream-75e05cbdaa013abe.yaml diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 996fc0ab4..3df11f3c0 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -70,6 +70,11 @@ debian: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" + mariadb: + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian" + suite: "bullseye" + component: "main" + gpg_key: "mariadb.gpg" rabbitmq: url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/" suite: "bullseye" @@ -113,6 +118,11 @@ debian-aarch64: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" + mariadb: + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian" + suite: "bullseye" + component: "main" + gpg_key: "mariadb.gpg" rabbitmq: url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/" suite: "bullseye" diff --git a/releasenotes/notes/debian-mariadb-upstream-75e05cbdaa013abe.yaml b/releasenotes/notes/debian-mariadb-upstream-75e05cbdaa013abe.yaml new file mode 100644 index 000000000..bd92fedc7 --- /dev/null +++ b/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 `__ -- cgit v1.2.3