diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-06-14 13:54:10 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-08-18 06:48:11 +0000 |
| commit | 7fa2ac132cce94aae8cd3d196abba342394f6c70 (patch) | |
| tree | 151dab788bfeedcefd04f12d719261f3ec8e7053 /kolla/template | |
| parent | a004abbdc36b425576c7a9a8c480df938f5c0a1f (diff) | |
| download | kolla-7fa2ac132cce94aae8cd3d196abba342394f6c70.tar.gz kolla-7fa2ac132cce94aae8cd3d196abba342394f6c70.zip | |
Move to Debian 12 'bookworm'
We move to use some components from distribution instead of 3rdparty
repos. At least for now - this may/will change later.
Packages from Debian:
- Erlang 25.2
- MariaDB 10.11
Some Ubuntu/jammy repositories are used in places where there is not
(yet) Debian/bookworm one.
openvswitch-netcontrold image fails as it needs to be converted to use
virtualenv - added into unbuildable images for now.
See https://etherpad.opendev.org/p/kolla-bobcat-ptg#L199 for more information.
Depends-On: https://review.opendev.org/891946
Change-Id: I45b5a5980fb2318f1aab23a3a6aaf0922563b171
Diffstat (limited to 'kolla/template')
| -rw-r--r-- | kolla/template/repos.yaml | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index ecc52121a..d7619dbe2 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -36,26 +36,28 @@ centos-aarch64: td-agent: "treasuredata" debian: - erlang: - url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "focal" - component: "main" - gpg_key: "erlang-ppa.gpg" + # 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" grafana: url: "https://apt.grafana.com" suite: "stable" component: "main" gpg_key: "grafana.asc" influxdb: - url: "https://repos.influxdata.com/debian" - suite: "bullseye" + url: "https://repos.influxdata.com/ubuntu" + suite: "jammy" component: "stable" gpg_key: "influxdb.asc" - mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" - suite: "bullseye" - component: "main" - gpg_key: "mariadb.gpg" + # 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" opensearch: url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" suite: "stable" @@ -67,42 +69,44 @@ debian: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/" suite: "./" component: "" gpg_key: "proxysql.asc" rabbitmq: url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" - suite: "bullseye" + suite: "bookworm" component: "main" gpg_key: "rabbitmq.gpg" td-agent: - url: "http://packages.treasuredata.com/4/debian/bullseye" - suite: "bullseye" + url: "http://packages.treasuredata.com/4/ubuntu/jammy" + suite: "jammy" component: "contrib" gpg_key: "treasuredata.asc" debian-aarch64: - erlang: - url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "focal" - component: "main" - gpg_key: "erlang-ppa.gpg" + # 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" grafana: url: "https://apt.grafana.com" suite: "stable" component: "main" gpg_key: "grafana.asc" influxdb: - url: "https://repos.influxdata.com/debian" - suite: "bullseye" + url: "https://repos.influxdata.com/ubuntu" + suite: "jammy" component: "stable" gpg_key: "influxdb.asc" - mariadb: - url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian" - suite: "bullseye" - component: "main" - gpg_key: "mariadb.gpg" + # 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" opensearch: url: "https://artifacts.opensearch.org/releases/bundle/opensearch/2.x/apt/" suite: "stable" @@ -114,18 +118,18 @@ debian-aarch64: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bullseye/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/bookworm/" suite: "./" component: "" gpg_key: "proxysql.asc" rabbitmq: url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" - suite: "bullseye" + suite: "bookworm" component: "main" gpg_key: "rabbitmq.gpg" td-agent: - url: "http://packages.treasuredata.com/4/debian/bullseye" - suite: "bullseye" + url: "http://packages.treasuredata.com/4/ubuntu/jammy" + suite: "jammy" component: "contrib" gpg_key: "treasuredata.asc" |
