openstack/kolla
Code Issues Proposed changes

Merge "kibana: enable for non-x86 on Debian/Ubuntu"

Browse Source
This commit is contained in:
Zuul 2020-02-27 22:31:23 +00:00 committed by Gerrit Code Review
commit 1e4cf45171
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

@ -82,7 +82,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
@ -93,7 +92,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
@ -192,6 +190,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
},
@ -199,6 +198,7 @@ UNBUILDABLE_IMAGES = {
'centos+ppc64le': {
"hacluster-pcs", # no binary package
"influxdb", # no binary package
"kibana", # no binary package
"mongodb", # no binary package
},