diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-16 12:23:50 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-17 18:15:13 +0100 |
| commit | 84003367bcd20c24f2e5884f5d86d2420506e816 (patch) | |
| tree | bb4c5d9ebcc148655b326e8de2b80d94ec64d4ed | |
| parent | 0d20f1bf3696ed35bf1fac8b748ab7bb7e8c6d9e (diff) | |
| download | kolla-84003367bcd20c24f2e5884f5d86d2420506e816.tar.gz kolla-84003367bcd20c24f2e5884f5d86d2420506e816.zip | |
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
| -rw-r--r-- | docker/base/apt_preferences.debian | 29 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index e69de29bb..76fa93576 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -0,0 +1,29 @@ +# We do not want packages from this repo +Package: * +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster +Pin-Priority: 100 + +# Unless it is kibana (on aarch64) +Package: kibana +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster +Pin-Priority: 600 + +# on x86-64 use upstream package for kibana +Package: kibana +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 +Pin-Priority: 600 + +# on x86-64 we want libvirt from Debian +Package: *libvirt* +Pin: release o=Debian,b=amd64 +Pin-Priority: 700 + +# on ppc64le we want libvirt from Debian +Package: *libvirt* +Pin: release o=Debian,b=ppc64le +Pin-Priority: 700 diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 30b28d905..f8e2fe514 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -18,3 +18,6 @@ deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main # td-agent for fluentd deb http://packages.treasuredata.com/3/debian/stretch stretch contrib + +# kibana for non-x86 and fixed libvirt for aarch64 +deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./ |