Fluentd config files persist on restart

[Will Szumski]

Old config files are left in the container because we use:

        {
            "source": "{{ container_config_directory }}/input/*.conf",
            "dest": "{{ fluentd_dir }}/input/",
            "owner": "{{ fluentd_user }}",
            "perm": "0600"
        },

This means that even in a file is removed from container_config_directory it still remains on restart.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/706327

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/706327
Committed: https://git.openstack.org/cgit/openstack/kolla-ansible/commit/?id=e7870e9df9e416b1b342ad6264bb66378fe62b3f
Submitter: Zuul
Branch: master

commit e7870e9df9e416b1b342ad6264bb66378fe62b3f
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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/train
Review: https://review.opendev.org/712066

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/stein
Review: https://review.opendev.org/712067

[OpenStack Infra (hudson-openstack)]

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)

[OpenStack Infra (hudson-openstack)]

Change abandoned by Mark Goddard (<email address hidden>) on branch: stable/stein
Review: https://review.opendev.org/712067
Reason: Squashed into https://review.opendev.org/#/c/713519

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/713519
Committed: https://git.openstack.org/cgit/openstack/kolla-ansible/commit/?id=06fbffe44025919761252cba50dbaef74f95df98
Submitter: Zuul
Branch: stable/stein

commit 06fbffe44025919761252cba50dbaef74f95df98
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: 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)