diff options
| author | Zuul <zuul@review.opendev.org> | 2019-08-20 09:58:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-08-20 09:58:04 +0000 |
| commit | e321f69ef18032d22dd49d8162c5120005feab09 (patch) | |
| tree | 2e8565318f0c42ad49dc5540f92b7e881dedc63e /docker/macros.j2 | |
| parent | b3dca90045c928349dced4f4b0ec99d67f3dd1ac (diff) | |
| parent | f4e0bbd3fb31fa6d24b0116e32f662691645a00d (diff) | |
| download | kolla-e321f69ef18032d22dd49d8162c5120005feab09.tar.gz kolla-e321f69ef18032d22dd49d8162c5120005feab09.zip | |
Merge "fluentd: there is no 'td-agent' for Debian/x86-64"
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 25d3a3752..50adf8bb6 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -111,7 +111,7 @@ RUN apt-get update \ {%- if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} {%- elif base_distro in ['debian', 'ubuntu'] -%} - {%- if base_arch == 'x86_64' -%} + {%- 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(' ') }} |
