openstack
/
kolla
Code Issues Proposed changes

Merge "Use td-agent-gem to install fluentd monasca plugin on ubuntu" into stable/stein

This commit is contained in:
Zuul 2019-06-27 10:31:52 +00:00 committed by Gerrit Code Review
parent 4edaf8a703 588c1076c3
commit b20b550b9b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/fluentd/Dockerfile.j2
View File

@ -82,7 +82,7 @@ RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
&& cd /tmp/fluentd-monasca-* \
&& gem build fluentd-monasca-output.gemspec \
&& gem install fluentd-monasca-output-*.gem \
&& fluent-gem install fluentd-monasca-output-*.gem \
&& {{ macros.install_fluent_plugins(['fluentd-monasca-output-*.gem'], chain=True) }} \
&& rm -rf /tmp/fluentd*
{% endblock %}

9
docker/macros.j2
View File

@ -105,12 +105,13 @@ RUN apt-get update \
&& chmod 755 /usr/bin/kubectl
{% endmacro %}
{% macro install_fluent_plugins(plugins) -%}
{% macro install_fluent_plugins(plugins, chain=False) -%}
{% if plugins is defined and plugins|length > 0 -%}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
RUN ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }}
{% if not chain -%} RUN {% endif -%}
{%- if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }}
{%- elif base_distro in ['debian', 'ubuntu'] -%}
RUN ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }}
ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }}
{%- endif %}
{%- endif %}
{%- endmacro %}