aboutsummaryrefslogtreecommitdiff
path: root/docker/base
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 /docker/base
parentb6d152e92dd7a6b59f3b9f248735dacadd26797e (diff)
parent345f0555bcae10056b0ef6a79d32cc124f07d5a2 (diff)
downloadkolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.tar.gz
kolla-26ba50c16f4560bcc3a405650d8f608c31b9df8d.zip
Merge "kibana/debian: use upstream package on all architectures"
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/apt_preferences.debian10
1 files changed, 0 insertions, 10 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 50aed13c3..b42d817d1 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -22,16 +22,6 @@ Package: *
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
Pin-Priority: 100
-# Unless it is kibana (on aarch64)
-Package: kibana kibana-oss
-Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
-Pin-Priority: 600
-
-# on x86-64 use upstream package for kibana
-Package: kibana kibana-oss
-Pin: release o=elastic,b=amd64
-Pin-Priority: 700
-
# We need fixed libvirt for aarch64
Package: *libvirt*
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster