summaryrefslogtreecommitdiff
path: root/docker/fluentd
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-05-23 10:25:28 +0100
committerMark Goddard <mark@stackhpc.com>2019-06-18 18:38:18 +0100
commit588c1076c3da583e9f654dcfbed5fde13788dc0d (patch)
treefadf909547bdfe28d8f254e8a24bd0700a2d9c5d /docker/fluentd
parente735b0985e3994d64f800a441e20bf3df092b74b (diff)
downloadkolla-588c1076c3da583e9f654dcfbed5fde13788dc0d.tar.gz
kolla-588c1076c3da583e9f654dcfbed5fde13788dc0d.zip
Use td-agent-gem to install fluentd monasca plugin on ubuntu
If monasca is enabled on ubuntu, we see the following error in fluentd: [error]: config error file="/etc/td-agent/td-agent.conf" error_class=Fluent::ConfigError error="Unknown output plugin 'monasca'. Run 'gem search -rd fluent-plugin' to find plugins" This is because we use 'fluent-gem install' to install the gem, which works on CentOS but on Ubuntu it is necessary to use 'td-agent-gem install'. Change-Id: I515f9764ca93a41a871e520696193a9298856d08 Closes-Bug: #1830147 (cherry picked from commit c585ca5055c7a92fdbe5826030d3529e5c397540)
Diffstat (limited to 'docker/fluentd')
-rw-r--r--docker/fluentd/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 6591388e6..1cf3821c3 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -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 %}