diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-06 10:33:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-06 10:33:49 +0000 |
| commit | 481843b80c97bb35aaa0134f60ea07266337fc2a (patch) | |
| tree | 7940eed7f491494110a18bced413d9e4d410c274 /docker/macros.j2 | |
| parent | 90892a25bd9aa96d7c070e49b0afbcee9bf5fca7 (diff) | |
| parent | ef8d7a27ab5b7d6fce8a060b1bc2709b0d1bbb98 (diff) | |
| download | kolla-481843b80c97bb35aaa0134f60ea07266337fc2a.tar.gz kolla-481843b80c97bb35aaa0134f60ea07266337fc2a.zip | |
Merge "Change fluentd to td-agent on CentOS"
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 %} |