aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-19 13:25:52 +0000
committerGerrit Code Review <review@openstack.org>2020-04-19 13:25:52 +0000
commit26ba50c16f4560bcc3a405650d8f608c31b9df8d (patch)
tree5b7c11c612f2c1cfb9116a02a61d51ed947f90fe /kolla
parentb6d152e92dd7a6b59f3b9f248735dacadd26797e (diff)
parent345f0555bcae10056b0ef6a79d32cc124f07d5a2 (diff)
downloadkolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.tar.gz
kolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.zip
Merge "kibana/debian: use upstream package on all architectures"
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/image/build.py1
-rw-r--r--kolla/template/repos.yaml3
2 files changed, 2 insertions, 2 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index abba38c0f..39b861200 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -165,6 +165,7 @@ UNBUILDABLE_IMAGES = {
},
'ubuntu+aarch64': {
+ "kibana", # no binary package
"sensu-base", # no binary package
},
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 1ed325141..2907fc200 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -57,7 +57,7 @@ debian-aarch64:
erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian buster stable"
- kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
+ kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
@@ -79,7 +79,6 @@ ubuntu-aarch64:
erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable"
- kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"