openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make Fluentd config folders readable"

Browse Source
This commit is contained in:
Zuul 2020-03-17 18:41:32 +00:00 committed by Gerrit Code Review
commit 5046463b10
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ansible/roles/common/templates/fluentd.json.j2
View File

@ -22,6 +22,14 @@
{% set fluentd_cmd = '/usr/sbin/td-agent' %}
{% endif %}
{%- macro config_directory_permissions(dir) -%}
{
"path": "{{ fluentd_dir }}/{{ dir }}",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"perm": "0700"
}
{%- endmacro -%}
{
"command": "{{ fluentd_cmd }}",
"config_files": [
@ -52,7 +60,12 @@
"path": "/var/lib/fluentd/data",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true
}
},
{# Allow Fluentd to read configuration from folders #}
{{ config_directory_permissions("input") }},
{{ config_directory_permissions("filter") }},
{{ config_directory_permissions("format") }},
{{ config_directory_permissions("output") }}
]
}