diff options
| author | Sven Kieske <kieske@osism.tech> | 2023-09-13 19:38:59 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-30 07:07:31 +0000 |
| commit | c0aee4adb69e25f0e75fc9f907cf962ef024f358 (patch) | |
| tree | c76ff1d04db66489d50fe53c1761736e9efcef33 /docker/fluentd/extend_start.sh | |
| parent | 30fd4b00eeb3aaabb615473df96aead9b34d0f0f (diff) | |
| download | kolla-c0aee4adb69e25f0e75fc9f907cf962ef024f358.tar.gz kolla-c0aee4adb69e25f0e75fc9f907cf962ef024f358.zip | |
bump td-agent lts from v4 to v5
notice that the td-agent command got renamed to fluentd.
see also the upgrade notes at[0].
for more details, refer to the changelog[1].
[0]: https://web.archive.org/web/20231006084137/https://www.fluentd.org/blog/upgrade-td-agent-v4-to-v5
[1]: https://github.com/fluent/fluent-package-builder/blob/b4b7017c09d78f2c404db62612733b40f69668a6/CHANGELOG.md#release-v500---20230729
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/901509
Change-Id: I5e95363c6c180e330945fe3d98e97c7049bbd6f7
Signed-off-by: Sven Kieske <kieske@osism.tech>
Diffstat (limited to 'docker/fluentd/extend_start.sh')
| -rw-r--r-- | docker/fluentd/extend_start.sh | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/docker/fluentd/extend_start.sh b/docker/fluentd/extend_start.sh index 73f3d145e..6b304b92c 100644 --- a/docker/fluentd/extend_start.sh +++ b/docker/fluentd/extend_start.sh @@ -6,23 +6,15 @@ # Also set the setgid permission on the /var/log/kolla directory so that new # files and sub-directories in that directory inherit its group id ("kolla"). -if [[ "${KOLLA_BASE_ARCH}" == "x86_64" && "${KOLLA_BASE_DISTRO}" != "debian" ]]; then - USERGROUP="td-agent:kolla" - FLUENTD="td-agent" -else - USERGROUP="fluentd:kolla" - FLUENTD="fluentd" -fi - if [ ! -d /var/log/kolla ]; then mkdir -p /var/log/kolla fi -if [[ $(stat -c %U:%G /var/log/kolla) != "${USERGROUP}" ]]; then - sudo chown ${USERGROUP} /var/log/kolla +if [[ $(stat -c %U:%G /var/log/kolla) != "fluentd:kolla" ]]; then + sudo chown fluentd:kolla /var/log/kolla fi if [[ $(stat -c %a /var/log/kolla) != "2775" ]]; then sudo chmod 2775 /var/log/kolla fi -if [[ (-d /var/lib/${FLUENTD}) && ($(stat -c %U:%G /var/lib/${FLUENTD}) != "${USERGROUP}") ]]; then - sudo chown ${USERGROUP} /var/lib/${FLUENTD} +if [[ (-d /var/lib/fluentd) && ($(stat -c %U:%G /var/lib/fluentd) != "fluentd:kolla") ]]; then + sudo chown fluentd:kolla /var/lib/fluentd fi |