From 245992d37c0d051ed50bd843e4ba4ba852373afe Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 13 Mar 2020 16:30:08 +0100 Subject: kibana, nova-libvirt: handle it properly for non-x86 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: I456402849022100bde1fffdfbf6292b35690f0f2 --- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 2e78ca63b..c9a806a14 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} {% if base_package_type == 'rpm' %} -- cgit v1.2.3