diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-22 12:55:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-22 12:55:09 +0000 |
| commit | acd0d4bf20e3b103c9a519f0f013bc9dbd67d973 (patch) | |
| tree | 2231b494395ae1c5b5ff292538406f01e396c686 /docker/fluentd | |
| parent | 9e4371d35aac6293d430d992585e48ddc5be1f05 (diff) | |
| parent | c19a222b4c2540f0875a47038f5edac9bb1c8a4d (diff) | |
| download | kolla-acd0d4bf20e3b103c9a519f0f013bc9dbd67d973.tar.gz kolla-acd0d4bf20e3b103c9a519f0f013bc9dbd67d973.zip | |
Merge "fluentd: migrate to td-agent 4 where possible"
Diffstat (limited to 'docker/fluentd')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 919aec8da..211db5c1e 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -2,10 +2,10 @@ FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} -{% if base_package_type == 'rpm' and base_arch != 'x86_64' %} +{% if base_package_type == 'rpm' and base_arch not in ['aarch64', 'x86_64'] %} LABEL fluentd_version="0.12" fluentd_binary="fluentd" {% set fluentd_user = 'fluentd' %} -{% elif base_package_type == 'deb' and base_arch != 'x86_64' %} +{% elif base_package_type == 'deb' and base_arch not in ['aarch64', 'x86_64'] %} LABEL fluentd_version="0.14" fluentd_binary="fluentd" {% set fluentd_user = 'fluentd' %} {% else %} @@ -26,7 +26,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" 'make' ] %} - {% if base_arch == 'x86_64' %} + {% if base_arch in ['aarch64', 'x86_64'] %} {% set fluentd_packages = fluentd_packages + [ 'td-agent' ] %} @@ -47,7 +47,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" 'make' ] %} - {% if base_arch == 'x86_64' %} + {% if base_arch in ['aarch64', 'x86_64'] %} {% set fluentd_packages = fluentd_packages + [ 'td-agent' ] %} @@ -65,7 +65,7 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" # Distro specific files and operations # Fluentd on rpm-based non-x86_64 is installed from rpm -{% if base_package_type == 'deb' and base_arch != 'x86_64' %} +{% if base_package_type == 'deb' and fluentd_binary == 'fluentd' %} RUN /usr/bin/gem install fluentd --no-rdoc --no-ri {% endif %} |