Reviewed: https://review.opendev.org/712066 Committed: https://git.openstack.org/cgit/openstack/kolla-ansible/commit/?id=3982d8d54206017d20e1ab8bc03cec965ad37ec1 Submitter: Zuul Branch: stable/train
commit 3982d8d54206017d20e1ab8bc03cec965ad37ec1 Author: Will Szumski <email address hidden> Date: Thu Feb 6 17:10:06 2020 +0000
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
Change-Id: I28f63ec81f1ea5bc4a213d053bfb2c04388d5925 Closes-Bug: #1862211 (cherry picked from commit e7870e9df9e416b1b342ad6264bb66378fe62b3f)
Reviewed: https:/ /review. opendev. org/712066 /git.openstack. org/cgit/ openstack/ kolla-ansible/ commit/ ?id=3982d8d5420 6017d20e1ab8bc0 3cec965ad37ec1
Committed: https:/
Submitter: Zuul
Branch: stable/train
commit 3982d8d54206017 d20e1ab8bc03cec 965ad37ec1
Author: Will Szumski <email address hidden>
Date: Thu Feb 6 17:10:06 2020 +0000
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
Change-Id: I28f63ec81f1ea5 bc4a213d053bfb2 c04388d5925 1b342ad6264bb66 378fe62b3f)
Closes-Bug: #1862211
(cherry picked from commit e7870e9df9e416b