From 19354d69d73f297f4057ec85f9ef5edefaba86f5 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 29 Sep 2023 11:07:19 +0200
Subject: [PATCH] debian: use erlang and mariadb from respective repos

Change-Id: I48caa7516a6fe8803a5bb6a451355d7981400074
---
 kolla/template/repos.yaml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 3b10851aca..0665be12ee 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -36,12 +36,11 @@ centos-aarch64:
   td-agent: "treasuredata"
 
 debian:
-  # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
-  #  erlang:
-  #  url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
-  #  suite: "jammy"
-  #  component: "main"
-  #  gpg_key: "erlang-ppa.gpg"
+  erlang:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
@@ -84,12 +83,11 @@ debian:
     gpg_key: "treasuredata.asc"
 
 debian-aarch64:
-  # NOTE(hrw): Debian/bookworm has Erlang 25 in repo
-  #  erlang:
-  #  url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
-  #  suite: "jammy"
-  #  component: "main"
-  #  gpg_key: "erlang-ppa.gpg"
+  erlang:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
   grafana:
     url: "https://apt.grafana.com"
     suite: "stable"
@@ -100,12 +98,11 @@ debian-aarch64:
     suite: "jammy"
     component: "stable"
     gpg_key: "influxdb.asc"
-  # NOTE(hrw): Debian/bookworm has MariaDB 10.11
-  # mariadb:
-  #  url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
-  #  suite: "bookworm"
-  #  component: "main"
-  # gpg_key: "mariadb.gpg"
+  mariadb:
+    url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
+    suite: "bookworm"
+    component: "main"
+    gpg_key: "mariadb.gpg"
   opensearch:
     url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/"
     suite: "stable"