aboutsummaryrefslogtreecommitdiff
path: root/kolla/template
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-10 10:31:52 +0000
committerGerrit Code Review <review@openstack.org>2020-08-10 10:31:52 +0000
commit7f4a32e1a38b7887c165b88d6ea3c31cef29abca (patch)
treeab13985a0d88f6d4fa0b23ff1991eca478896030 /kolla/template
parent154bc37f637bb6b164cfbe9e2a1769dd431b49d3 (diff)
parentd2966452c56c3dee27839a8d277eb069671b51df (diff)
downloadkolla-7f4a32e1a38b7887c165b88d6ea3c31cef29abca.tar.gz
kolla-7f4a32e1a38b7887c165b88d6ea3c31cef29abca.zip
Merge "ubuntu: move to 20.04 Focal"
Diffstat (limited to 'kolla/template')
-rw-r--r--kolla/template/repos.yaml19
1 files changed, 10 insertions, 9 deletions
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 769175c55..416b91cef 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -70,26 +70,27 @@ debian-aarch64:
ubuntu:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ bionic erlang"
+ erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
- influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
+ influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
- qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main"
+ mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
+ qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
+ # NOTE(hrw): upstream uses bionic repo for focal
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
- td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
+ td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-aarch64:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
- erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./"
+ erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
- influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
+ influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
- td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib"
+ td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
ubuntu-ppc64le:
- mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
+ mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"