From d3cb86a8373e7619f09e5852cdeff3be94fe153c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 28 Dec 2021 08:57:51 +0000 Subject: [PATCH] Add fluentd grok-parser plugin on CentOS on aarch64 This conditional was missed in the original patch moving aarch64 to td-agent. [1] After this change, other plugins will have newer versions installed as well, as it happens in other image flavours. [1] I86ecdc1ac45dfd76b94a34d1b837f7c0bc975dcd Closes-Bug: #1955889 Change-Id: I10ff098b3356eb02ad4a1006b988812356768fec --- docker/fluentd/Dockerfile.j2 | 2 +- releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 0f3fe11df6..2469ae99e2 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -82,7 +82,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block fluentd_plugins_install %} -{% if not (base_package_type == 'rpm' and base_arch != 'x86_64') %} +{% if base_arch in ['aarch64', 'x86_64'] %} {% set fluentd_plugins = [ 'fluent-plugin-elasticsearch', 'fluent-plugin-grep', diff --git a/releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml b/releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml new file mode 100644 index 0000000000..c31e71e480 --- /dev/null +++ b/releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + fluentd on CentOS on aarch64 is no longer missing the grok-parser plugin. + `LP#1955889 `__