From ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 9 Aug 2019 14:34:52 +0200 Subject: Change fluentd to td-agent on CentOS Fluentd packages in CentOS Opstools SIG repos is very old, because of old-ish ruby (2.0) packaged with CentOS 7. On the other hand - TreasureData packages for fluentd are packaged with embedded ruby as dependencies - so this change moves to those. Thanks to that we are able to move from fluentd 0.12 to 1.4.2. Still we need ruby-devel for non-td-agent distros, because we download monasca output plugin as source and build it during installation. * Bump up td.repo to version 3 * Merge sudoers into one file * Change fluentd plugin install macro to reflect changes Depends-On: https://review.opendev.org/679209/ Depends-On: https://review.opendev.org/679885/ Change-Id: I40a81103317ac044d9311b2505593056cf313bd2 --- docker/macros.j2 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docker/macros.j2') diff --git a/docker/macros.j2 b/docker/macros.j2 index 50adf8bb6..029e995c7 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -108,14 +108,10 @@ RUN apt-get update \ {% macro install_fluent_plugins(plugins, chain=False) -%} {% if plugins is defined and plugins|length > 0 -%} {% if not chain -%} RUN {% endif -%} - {%- if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} + {%- if base_arch == 'x86_64' and base_distro in ['centos', 'oraclelinux', 'rhel', 'ubuntu'] -%} + ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} + {%- else -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} - {%- elif base_distro in ['debian', 'ubuntu'] -%} - {%- if base_arch == 'x86_64' and base_distro == 'ubuntu' -%} - ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} - {%- else -%} - ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} - {%- endif %} {%- endif %} {%- endif %} {%- endmacro %} -- cgit v1.2.3