diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-20 21:16:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-20 21:16:43 +0000 |
| commit | ac059f85639b0dac4d962d2b0f89a1386496fe61 (patch) | |
| tree | 196ccd5bb8d4e0e317f6df7935d6cc53813fc9d9 /docker/fluentd/Dockerfile.j2 | |
| parent | 4ad7896e5cfd1445ed9cc04c9eada08c9bef7af7 (diff) | |
| parent | 00032822535e0aca208263aa2bd84be83132d60a (diff) | |
| download | kolla-ac059f85639b0dac4d962d2b0f89a1386496fe61.tar.gz kolla-ac059f85639b0dac4d962d2b0f89a1386496fe61.zip | |
Merge "Use community fluentd packages for CentOS/RHEL/Oraclelinux"
Diffstat (limited to 'docker/fluentd/Dockerfile.j2')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index c823b8715..7f0820e52 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -5,27 +5,48 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='td-agent', groups='mysql') }} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {{ macros.configure_user(name='fluentd', groups='mysql') }} +# TODO:remove hostname package as it should be installed by the +# fluentd dependencies. +# hostname package is installed by default on CentOS/RHEL but not on +# oraclelinux. + {% set fluentd_packages = [ + 'fluentd', 'gcc-c++', + 'hostname', 'make', - 'td-agent' + 'ruby-devel' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - + {{ macros.configure_user(name='td-agent', groups='mysql') }} {% set fluentd_packages = [ 'g++', 'make', 'td-agent' ] %} + {% endif %} {{ macros.install_packages(fluentd_packages | customizable("packages")) }} +{% block fluentd_plugins_install %} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN ulimit -n 65536 \ + && gem install --minimal-deps activesupport:4.2.9 fluent-plugin-parser fluent-plugin-kubernetes_metadata_filter fluent-plugin-elasticsearch fluent-plugin-grep fluent-plugin-grok-parser:0.3.1 fluent-plugin-rewrite-tag-filter \ + && chmod -R 440 /etc/sudoers.d/kolla_fluentd_sudoers \ + && chmod 755 /usr/local/bin/kolla_extend_start \ + && mkdir -p /var/run/fluentd \ + && chown -R fluentd: /etc/fluentd /var/run/fluentd + +{% elif base_distro in ['debian', 'ubuntu'] %} # NOTE: We use fluentd version is v12.0 so fluent-plugin-grok-parse version should < 1.0.0. # https://github.com/fluent/fluent-plugin-grok-parser RUN ulimit -n 65536 \ @@ -40,7 +61,15 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start \ && chown -R td-agent: /etc/td-agent +{% endif %} + +{% endblock %} + {% block fluentd_footer %}{% endblock %} {% block footer %}{% endblock %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +USER fluentd +{% elif base_distro in ['debian', 'ubuntu'] %} USER td-agent +{% endif %} |
