diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-17 23:26:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-17 23:26:52 +0000 |
| commit | 6f4e98c67898dea4834abf1cc435848247ee7c44 (patch) | |
| tree | d79f7a4544a1e08697995dc18951faebd279e240 /docker/fluentd | |
| parent | 540b0cf6d7da4f7a85c54af847d4f519471d6e27 (diff) | |
| parent | 5e4ade198f794e79ee02a21f77dddd9f1fd2d16e (diff) | |
| download | kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.tar.gz kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.zip | |
Merge "docker: fix 'Empty continuation line found' warnings"
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 76fe1c322..5091efae6 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -107,11 +107,11 @@ ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive RUN curl -sSL $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \ && tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \ && cd /tmp/fluentd-monasca-* \ -{% if fluentd_user == 'fluentd' %} +{%- if fluentd_user == 'fluentd' %} && gem build fluentd-monasca-output.gemspec \ -{% else %} +{%- else %} && td-agent-gem build fluentd-monasca-output.gemspec \ -{% endif %} +{%- endif %} && {{ macros.install_fluent_plugins(fluentd_user, ['fluentd-monasca-output-*.gem'], chain=True) }} \ && rm -rf /tmp/fluentd* |