aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-01-11 11:05:00 +0000
committerGerrit Code Review <review@openstack.org>2022-01-11 11:05:00 +0000
commit8e0650e4bb4ecc784cb38ae390b2e0b329ceaf4e (patch)
tree990ff3795efa9a5f80b66fcc59eb45946c6e5c65
parent21c761260a7c641020c101a47b08c77cbc4f94fc (diff)
parentd3cb86a8373e7619f09e5852cdeff3be94fe153c (diff)
downloadkolla-8e0650e4bb4ecc784cb38ae390b2e0b329ceaf4e.tar.gz
kolla-8e0650e4bb4ecc784cb38ae390b2e0b329ceaf4e.zip
Merge "Add fluentd grok-parser plugin on CentOS on aarch64"
-rw-r--r--docker/fluentd/Dockerfile.j22
-rw-r--r--releasenotes/notes/bug-1955889-92d98ef6527a75ef.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 0f3fe11df..2469ae99e 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 000000000..c31e71e48
--- /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 <https://launchpad.net/bugs/1955889>`__