openstack/kolla
Code Issues Proposed changes

kibana: enable for non-x86 on Debian/Ubuntu

Browse Source 
As upstream generated 'all' package as 'amd64' one I took some time and
repackaged it.

Change-Id: Ie84ed771ffa9ecd70b945673727895c8edad30eb
This commit is contained in:
Marcin Juszkiewicz 2020-02-14 09:00:57 +00:00
parent 063a46a7de
commit b050ef63e8
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/kibana/Dockerfile.j2
View File

@ -9,7 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='kibana') }}
{% set kibana_packages = ['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 %}
{{ macros.install_packages(kibana_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

4
kolla/image/build.py
View File

@ -84,7 +84,6 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR,
UNBUILDABLE_IMAGES = {
'aarch64': {
"cyborg-base", # no binary package
"kibana", # no binary package
"monasca-grafana", # no phantomJS on aarch64
"opendaylight", # no binary package
"prometheus-mtail", # no aarch64 binary
@ -95,7 +94,6 @@ UNBUILDABLE_IMAGES = {
"cyborg-base", # no binary package
"elasticsearch", # no binary package
"grafana", # no binary package
"kibana", # no binary package
"monasca-grafana", # no phantomJS
"opendaylight", # no binary package
"prometheus-base", # no ppc64le binaries
@ -195,6 +193,7 @@ UNBUILDABLE_IMAGES = {
"elasticsearch", # no binary package
"hacluster-pcs", # no binary package
"influxdb", # no binary package
"kibana", # no binary package
"mongodb", # no binary package
"telegraf", # no binary package
},
@ -202,6 +201,7 @@ UNBUILDABLE_IMAGES = {
'centos+ppc64le': {
"hacluster-pcs", # no binary package
"influxdb", # no binary package
"kibana", # no binary package
"mongodb", # no binary package
},