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 17:10:41 +0000 |
| commit | 1817a09150111da4486dbe27af052c3ba8aa801c (patch) | |
| tree | 7dfae12128b3237b3a8e57ebf561fa1fdb173ffa /docker/kibana | |
| parent | 2de75d4912e1544f49f7c37d6ea85c71bd3fe5f3 (diff) | |
| download | kolla-1817a09150111da4486dbe27af052c3ba8aa801c.tar.gz kolla-1817a09150111da4486dbe27af052c3ba8aa801c.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
Diffstat (limited to 'docker/kibana')
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index cbe1d454c..ed365967f 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -7,14 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kibana') }} -{% if base_arch != 'x86_64' and base_distro in ['debian', 'ubuntu'] %} - {% set kibana_packages = [ - 'nodejs', - 'http://obs.linaro.org/home:/marcin.juszkiewicz/debian-buster/all/kibana_5.6.16-0linaro1_all.deb' - ] %} -{% else %} - {% set kibana_packages = ['kibana'] %} -{% endif %} +{% set kibana_packages = ['kibana'] %} + {{ macros.install_packages(kibana_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start |