diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2019-02-21 16:46:21 +0000 |
|---|---|---|
| committer | Pedro Alvarez Piedehierro <pedro.alvarez@codethink.co.uk> | 2019-03-28 16:26:22 +0000 |
| commit | 35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1 (patch) | |
| tree | bf45e7133842a6848199ebc3b3b35b2e7fbc7b92 /docker/macros.j2 | |
| parent | 83e8be4f0597c4572f58a1052010d3660064cdb9 (diff) | |
| download | kolla-35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1.tar.gz kolla-35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1.zip | |
Install fluentd gem on debian/ubuntu for non x86_64
The package used to install fluentd on debian/ubuntu is not
available for architectures other than x86_64. For those cases
install fluentd as a gem until the package 'td-agent' is available
for more architectures.
Change-Id: Ic1b25b37d06b429a112f1418a79d385d505bb1e9
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 533a14aa5..6a0fdb568 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -110,7 +110,11 @@ RUN apt-get update \ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} RUN 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(' ') }} + {% if base_arch == 'x86_64' %} + RUN ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} + {% else %} + RUN ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} + {% endif %} {%- endif %} {%- endif %} {%- endmacro %} |