diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-28 19:04:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-28 19:04:17 +0000 |
| commit | 3e9cf08ac59c6b38b1542ac12e19ff44af92eb12 (patch) | |
| tree | 01503dab66b3fbefb1585d8016708e84352ad4f7 /docker/macros.j2 | |
| parent | 554a521d6e49dafc61f591fbccee296070bf08fa (diff) | |
| parent | 35394e25a33c6bbfdc2e1853adfa8f2a1a5614c1 (diff) | |
| download | kolla-3e9cf08ac59c6b38b1542ac12e19ff44af92eb12.tar.gz kolla-3e9cf08ac59c6b38b1542ac12e19ff44af92eb12.zip | |
Merge "Install fluentd gem on debian/ubuntu for non x86_64"
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 e0051c14a..2eb095ae2 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 %} |