diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-26 17:17:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-26 17:17:26 +0000 |
| commit | 5e7e80fd8828b6614fedc46cc967fe786e780219 (patch) | |
| tree | c9d9c8668c469e0ab060f7de5ac0136d09ccbf3c | |
| parent | 80a16bfc6ef2694bbaa490c30ab9bc1e29e35825 (diff) | |
| parent | 19354d69d73f297f4057ec85f9ef5edefaba86f5 (diff) | |
| download | kolla-5e7e80fd8828b6614fedc46cc967fe786e780219.tar.gz kolla-5e7e80fd8828b6614fedc46cc967fe786e780219.zip | |
Merge "debian: use erlang and mariadb from respective repos"
| -rw-r--r-- | kolla/template/repos.yaml | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a344c24aa..54396b250 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -39,12 +39,11 @@ centos-aarch64: # https://www.rabbitmq.com/install-debian.html#apt-cloudsmith 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" @@ -87,12 +86,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" @@ -103,12 +101,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" |