Skip to content

Commit df73339

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "fluentd: pin td-agent to 4.4.2" into stable/yoga
2 parents 2a302e5 + 59a5de3 commit df73339

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

docker/base/apt_preferences.debian

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Package: logstash-oss
1212
Pin: version 7.9.*
1313
Pin-Priority: 1000
1414

15+
# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
16+
Package: td-agent*
17+
Pin: version 4.4.2-1
18+
Pin-Priority: 1000
19+
1520
# NOTE(hrw): we do not want backports unless requested
1621
Package: *
1722
Pin: release n=bullseye-backports

docker/base/apt_preferences.ubuntu

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ Pin-Priority: 1000
1111
Package: logstash-oss
1212
Pin: version 7.9.*
1313
Pin-Priority: 1000
14+
15+
# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
16+
Package: td-agent*
17+
Pin: version 4.4.2-1
18+
Pin-Priority: 1000
19+

docker/fluentd/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1616
{% set fluentd_packages = [
1717
'gcc-c++',
1818
'make',
19-
'td-agent',
19+
'td-agent-4.4.2',
2020
] %}
2121

2222
{% elif base_package_type == 'deb' %}

0 commit comments

Comments
 (0)