From 1817a09150111da4486dbe27af052c3ba8aa801c Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Mon, 16 Mar 2020 12:23:50 +0100
Subject: 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
---
 docker/base/Dockerfile.j2          |  1 +
 docker/base/apt_preferences.debian | 29 +++++++++++++++++++++++++++++
 docker/base/sources.list.debian    |  3 +++
 3 files changed, 33 insertions(+)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index f2a7f251a..624e46d85 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -486,6 +486,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       'https://packages.grafana.com/gpg.key',
       'http://buster-train.debian.net/debian/dists/pubkey.gpg',
       'https://packages.treasuredata.com/GPG-KEY-td-agent',
+      'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
     ] %}
     {% set base_apt_packages = base_apt_packages +
       ['sudo',]
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 f07a725dc..1c296b0cd 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -19,3 +19,6 @@ deb http://buster-train.debian.net/debian buster-train-backports-nochange main
 
 # td-agent for fluentd
 deb http://packages.treasuredata.com/3/debian/buster buster contrib
+
+# kibana for non-x86 and fixed libvirt for aarch64
+deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./
-- 
cgit v1.2.3