diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-27 22:31:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-27 22:31:23 +0000 |
| commit | 1e4cf4517165b4e6bca1a84e837dccbd10a33686 (patch) | |
| tree | a599a07164d25c8e1dd0c512515f74b6e9380158 | |
| parent | 8e9a8e7aed54e798527fed04c3a21d0914b458fd (diff) | |
| parent | b050ef63e81c5fdc210b0e99298b2738bad6b5d2 (diff) | |
| download | kolla-1e4cf4517165b4e6bca1a84e837dccbd10a33686.tar.gz kolla-1e4cf4517165b4e6bca1a84e837dccbd10a33686.zip | |
Merge "kibana: enable for non-x86 on Debian/Ubuntu"
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 9 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 52dc1085a..4845958c0 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -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 diff --git a/kolla/image/build.py b/kolla/image/build.py index f07cb777f..454f675fe 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -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 }, |