aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorDoug Szumski <doug@stackhpc.com>2020-06-18 17:09:24 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2020-07-07 13:16:00 +0000
commit25f74fb943d76f46d5b166ba8c0506a4a2ce06ca (patch)
tree0d1c9176320dd36d1fc48bd99d8efab62d1e2815 /docker/base
parent9fc8f3e9872c4a9c5fca8419979be3a254dd893a (diff)
downloadkolla-25f74fb943d76f46d5b166ba8c0506a4a2ce06ca.tar.gz
kolla-25f74fb943d76f46d5b166ba8c0506a4a2ce06ca.zip
Upgrade to Logstash 6
Elasticsearch and Kibana 6 are used on all distros, but Logstash is still pinned at 2 which is not compatible. See the product compatibility matrix [1]. [1] https://www.elastic.co/support/matrix#matrix_compatibility Partial-Bug: #1884090 Change-Id: I1579e762bcfb07f0baa73507eb9955ae2f83c4ec
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j25
1 files changed, 1 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index fd2ced890..f761da6dd 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -104,14 +104,11 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
] %}
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
+ 'elasticsearch.repo',
'grafana.repo',
'rabbitmq_rabbitmq-server.repo',
'rabbitmq_rabbitmq-erlang-aarch64.repo',
] %}
- # FIXME(mgoddard): Not available for CentOS 8 yet.
- #
- # 'elasticsearch.repo',
- #
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',