diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2019-08-09 14:34:52 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2019-09-04 09:10:28 +0000 |
| commit | ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98 (patch) | |
| tree | 2819d68c82df46422af51473915a39442f05602b /docker/macros.j2 | |
| parent | b602f0144ac603b6882a406db8e608fa447d58f0 (diff) | |
| download | kolla-ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98.tar.gz kolla-ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98.zip | |
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
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 10 |
1 files changed, 3 insertions, 7 deletions
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 %} |