diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-09 11:08:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-09 11:08:04 +0000 |
| commit | 838ee8cd9d14a9eee4401c616e92d5147f6808fc (patch) | |
| tree | a3cc3f9bdd42832c27bab51f15fd562ad18f6f7a /docker | |
| parent | 758b53016ac0328a584c843ef1972fa2e8572571 (diff) | |
| parent | 711ec0829a95a12ae9e290aeb3837b457e1dd215 (diff) | |
| download | kolla-838ee8cd9d14a9eee4401c616e92d5147f6808fc.tar.gz kolla-838ee8cd9d14a9eee4401c616e92d5147f6808fc.zip | |
Merge "Futureproof the uninstallation of offending es gems"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 9f8faf382..c9c8277ea 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -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 |