diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-27 13:16:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-27 13:16:43 +0000 |
| commit | 5b2d5881d8182c9532da72c353e10834833777a7 (patch) | |
| tree | d12c6691c82a03a0a14934bf399a67dc325c9c15 /docker | |
| parent | d31a87b0bd2b0209d3ec2753a7ffd76a06a5d79d (diff) | |
| parent | a8e6924beaea3e268435156f6bbc34812a69a01c (diff) | |
| download | kolla-5b2d5881d8182c9532da72c353e10834833777a7.tar.gz kolla-5b2d5881d8182c9532da72c353e10834833777a7.zip | |
Merge "Unpin td-agent and cap elasticsearch gem"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 5 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 5 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 11 |
3 files changed, 8 insertions, 13 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 687736c76..0ccc2e016 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -7,11 +7,6 @@ Package: erlang* Pin: version 1:23.* Pin-Priority: 1000 -# FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. -Package: td-agent* -Pin: version 4.0.* -Pin-Priority: 1000 - # NOTE(mgoddard): logstash 7.9.x is the last version that supports # Elasticsearch OSS. Package: logstash-oss diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 4f0707067..fd8609d94 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -6,11 +6,6 @@ Package: erlang* Pin: version 1:23.* Pin-Priority: 1000 -# FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. -Package: td-agent* -Pin: version 4.0.* -Pin-Priority: 1000 - # NOTE(mgoddard): logstash 7.9.x is the last version that supports # Elasticsearch OSS. Package: logstash-oss diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 90eaa45b5..9f8faf382 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -13,11 +13,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} - # FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. {% set fluentd_packages = [ 'gcc-c++', 'make', - 'td-agent-4.0.*', + 'td-agent', ] %} {% elif base_package_type == 'deb' %} @@ -31,7 +30,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.configure_user(name=fluentd_user, groups='mysql') }} -{{ macros.install_packages(fluentd_packages | customizable("packages")) }} + +# 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 COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers |