From 79b74ff220aad8db98c10c124064c85d21e2d4ea Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Tue, 28 Dec 2021 09:50:41 +0000 Subject: Clean up fluentd image recipe Since Xena, there is no arch supported other than x86_64 and aarch64. Additionally, the conditional for x86_64 Debian does not seem to be needed now with current td-agent. Moreover, drop two plugins that are relevant only to fluentd 0.12, one of which (parser) causes fluentd 0.12 (!) to be installed. Modern fluentd has both built-in. Finally, drop the labels as they are no longer useful. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/823093 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/823094 Change-Id: I7326cd8fcfa459dedcb6404e5287f0f5aeeed6cb --- docker/macros.j2 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'docker/macros.j2') diff --git a/docker/macros.j2 b/docker/macros.j2 index 61e3edce1..346e1dcb3 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -58,14 +58,10 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ && chown -R {{ user.uid }}:{{ user.gid }} {{ homedir }} {% endmacro %} -{% macro install_fluent_plugins(binary, plugins, chain=False) -%} +{% macro install_fluent_plugins(plugins, chain=False) -%} {% if plugins is defined and plugins|length > 0 -%} {% if not chain -%} RUN {% endif -%} - {%- if binary == 'td-agent' -%} - ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} - {%- else -%} - ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} - {%- endif %} + ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} {%- endif %} {%- endmacro %} -- cgit v1.2.3