diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-15 14:28:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-15 14:28:37 +0000 |
| commit | ebb871338a7c3315677e510f5a3b1ad4c7040c52 (patch) | |
| tree | 20dfdd337d8c4cec147e1aee35f63f6f67262e82 | |
| parent | 3110cb136731c1d2b1598c6b3006069a90e464fe (diff) | |
| parent | 6d0882ef799bb531d007c3e6839ef318fd512d5c (diff) | |
| download | kolla-ebb871338a7c3315677e510f5a3b1ad4c7040c52.tar.gz kolla-ebb871338a7c3315677e510f5a3b1ad4c7040c52.zip | |
Merge "Pin td-agent to 4.0.* to fix missing logs"
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 5 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1930867.yaml | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c8e36affd..2928ee662 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -5,3 +5,8 @@ Pin-Priority: 1000 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 diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 29176c0cf..0f3fe11df 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -27,8 +27,9 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent" ] %} {% if base_arch in ['aarch64', 'x86_64'] %} + # FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867. {% set fluentd_packages = fluentd_packages + [ - 'td-agent' + 'td-agent-4.0.*' ] %} {% else %} {% set fluentd_packages = fluentd_packages + [ diff --git a/releasenotes/notes/bug-1930867.yaml b/releasenotes/notes/bug-1930867.yaml new file mode 100644 index 000000000..fbdfca82d --- /dev/null +++ b/releasenotes/notes/bug-1930867.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with logs going missing in the Fluentd pipeline + by pinning td-agent to 4.0.*. + `LP#1930867 <https://launchpad.net/bugs/1930867>`__ |