Original Change-Id: I28f63ec81f1ea5bc4a213d053bfb2c04388d5925
Closes-Bug: #1862211
(cherry picked from commit e7870e9df9e416b1b342ad6264bb66378fe62b3f)
2. Make Fluentd config folders readable
Currently, config folders lack the execute bit so Fluentd
cannot read the config and just does nothing when it starts up. This
change explicitly sets the execute bit on folders which need it,
rather than doing it in a more generic way which is more risky from
a security perspective.
Change-Id: Ia840f4b67043df4eaa654f47673dcdc973f13d9c
Closes-Bug: #1867754
(cherry picked from commit c92378d7881927d46ff5d485edcf25989c0c4170)
Reviewed: https:/ /review. opendev. org/713519 /git.openstack. org/cgit/ openstack/ kolla-ansible/ commit/ ?id=06fbffe4402 5919761252cba50 dbaef74f95df98
Committed: https:/
Submitter: Zuul
Branch: stable/stein
commit 06fbffe44025919 761252cba50dbae f74f95df98
Author: Will Szumski <email address hidden>
Date: Thu Feb 6 17:10:06 2020 +0000
Combined fluentd fixes
1. Delete stale fluent config on restart
We already only include .conf files in fluent.conf:
(fluentd) [fluentd@ cpu-e-1041 /etc/fluentd]$ cat fluent.conf
@include input/*.conf
@include filter/*.conf
@include format/*.conf
@include output/*.conf
so this change should not cause ill effect. This works because of the
merge option in config files:
merge: merges the source directory into the target directory instead of
replacing it. Boolean, defaults to false.
see https:/ /docs.openstack .org/kolla/ latest/ admin/kolla_ api.html# kolla-api- external- config
Original Change-Id: I28f63ec81f1ea5 bc4a213d053bfb2 c04388d5925 1b342ad6264bb66 378fe62b3f)
Closes-Bug: #1862211
(cherry picked from commit e7870e9df9e416b
2. Make Fluentd config folders readable
Currently, config folders lack the execute bit so Fluentd
cannot read the config and just does nothing when it starts up. This
change explicitly sets the execute bit on folders which need it,
rather than doing it in a more generic way which is more risky from
a security perspective.
Change-Id: Ia840f4b67043df 4eaa654f47673dc dc973f13d9c 46ff5d485edcf25 989c0c4170)
Closes-Bug: #1867754
(cherry picked from commit c92378d7881927d