openstack/kolla
Code Issues Proposed changes

Merge "Futureproof the uninstallation of offending es gems"

Browse Source
This commit is contained in:
Zuul 2022-02-09 11:08:04 +00:00 committed by Gerrit Code Review
commit 838ee8cd9d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/fluentd/Dockerfile.j2
View File

@ -34,9 +34,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES
{{ macros.install_packages(fluentd_packages | customizable("packages")) }} \
&& td-agent-gem install elasticsearch:7.13.0 \
&& td-agent-gem uninstall elasticsearch:7.15.0 \
&& td-agent-gem uninstall elasticsearch-api:7.15.0 \
&& td-agent-gem uninstall elasticsearch-transport:7.15.0
&& td-agent-gem uninstall "elasticsearch:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
&& td-agent-gem uninstall "elasticsearch-transport:>7.13.0"
COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers