diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 18:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 18:11:30 +0000 |
| commit | 827dcbc7df6ea426c0cd1841589db57cd65a46d6 (patch) | |
| tree | 7adefc6544371a8bd7e7da372b37a99ccfbbdd7b /docker/macros.j2 | |
| parent | 2241efb2eb61361c9291fd137250cb5e7719384d (diff) | |
| parent | fa8e174be6bc5b4d555258197938da9da40bfa81 (diff) | |
| download | kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.tar.gz kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.zip | |
Merge "Remove support for OracleLinux"
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 029e995c7..0af3fe43c 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -108,7 +108,7 @@ 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_arch == 'x86_64' and base_distro in ['centos', 'oraclelinux', 'rhel', 'ubuntu'] -%} + {%- if base_arch == 'x86_64' and base_distro in ['centos', 'rhel', 'ubuntu'] -%} ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} {%- else -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} |