diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-09-25 09:52:38 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-09-25 08:43:30 +0000 |
| commit | 76fbf2c08b17f73dd304c1316fbabbbbe9d9468a (patch) | |
| tree | 63f30403571e29c324dd6b3e174f28523588745c /docker/macros.j2 | |
| parent | 2131ef9875efd67a9dd45dc3329df8de16cacff1 (diff) | |
| download | kolla-76fbf2c08b17f73dd304c1316fbabbbbe9d9468a.tar.gz kolla-76fbf2c08b17f73dd304c1316fbabbbbe9d9468a.zip | |
Debian: switch fluentd to td-agent on x86_64
This patch uses the newly added td-agent repo on Debian.
It also makes code more robust regarding different distro handling.
We now have td-agent everywhere on x86_64.
Change-Id: I4d2449d7d100c68084f937ef9981596fc1625375
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 0af3fe43c..0e4078ec9 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -105,10 +105,10 @@ RUN apt-get update \ && chmod 755 /usr/bin/kubectl {% endmacro %} -{% macro install_fluent_plugins(plugins, chain=False) -%} +{% macro install_fluent_plugins(binary, plugins, chain=False) -%} {% if plugins is defined and plugins|length > 0 -%} {% if not chain -%} RUN {% endif -%} - {%- if base_arch == 'x86_64' and base_distro in ['centos', 'rhel', 'ubuntu'] -%} + {%- if binary == 'td-agent' -%} ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} {%- else -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} |