Skip to content

Commit 8400336

Browse files
committed
kibana, nova-libvirt: handle it properly for non-x86
manual backport from master changes: - https://review.opendev.org/#/c/712987/ - https://review.opendev.org/#/c/713403 Upstream kibana package contains NodeJS x86-64 binaries so can not be used directly on non-x86 architectures. I took upstream packages, removed NodeJS binary from it and added 'nodejs' dependency. Package is present in my Linaro OBS repository where I keep other packages needed for aarch64 kolla run. Via APT pinning I mark them as not wanted so they are not used on any architecture with two exceptions: 1. libvirt - we need fixed version to be able to use ThunderX servers 2. kibana - to be able to run it at all For x86-64 upstream kibana package is used. Closes-bug: #1867365 Change-Id: I955619d6992f8714ae753dc155e248d255340ecf
1 parent 0d20f1b commit 8400336

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

docker/base/apt_preferences.debian

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# We do not want packages from this repo
2+
Package: *
3+
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
4+
Pin-Priority: 100
5+
6+
# Unless it is kibana (on aarch64)
7+
Package: kibana
8+
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
9+
Pin-Priority: 600
10+
11+
# on x86-64 use upstream package for kibana
12+
Package: kibana
13+
Pin: release o=elastic,b=amd64
14+
Pin-Priority: 700
15+
16+
# We need fixed libvirt for aarch64
17+
Package: *libvirt*
18+
Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
19+
Pin-Priority: 600
20+
21+
# on x86-64 we want libvirt from Debian
22+
Package: *libvirt*
23+
Pin: release o=Debian,b=amd64
24+
Pin-Priority: 700
25+
26+
# on ppc64le we want libvirt from Debian
27+
Package: *libvirt*
28+
Pin: release o=Debian,b=ppc64le
29+
Pin-Priority: 700

docker/base/sources.list.debian

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main
1818

1919
# td-agent for fluentd
2020
deb http://packages.treasuredata.com/3/debian/stretch stretch contrib
21+
22+
# kibana for non-x86 and fixed libvirt for aarch64
23+
deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./

0 commit comments

Comments
 (0)