Do not create haproxy and swift log dirs needlessly

Closes-Bug: #1945070
Change-Id: I1b2a82b57cb9884b6c3c3ad07f6449ae29042a3d
This commit is contained in:
Radosław Piliszek 2021-09-25 20:05:02 +00:00
parent d85af34ccd
commit 2c6bc0bd1a
3 changed files with 14 additions and 0 deletions

View File

@ -1,3 +1,4 @@
{% if enable_swift | bool and (inventory_hostname in groups['swift-proxy-server'] or inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server']) %}
<match syslog.{{ syslog_swift_facility }}.**>
@type copy
<store>
@ -58,7 +59,9 @@
</store>
{% endif %}
</match>
{% endif %}
{% if enable_haproxy | bool and inventory_hostname in groups['loadbalancer'] %}
<match syslog.{{ syslog_haproxy_facility }}.**>
@type copy
<store>
@ -121,6 +124,7 @@
</store>
{% endif %}
</match>
{% endif %}
{% if glance_enable_tls_backend | bool %}
<match syslog.{{ syslog_glance_tls_proxy_facility }}.**>

View File

@ -29,11 +29,13 @@
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true
},
{% if enable_haproxy | bool and inventory_hostname in groups['loadbalancer'] %}
{
"path": "/var/log/kolla/haproxy",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true
},
{% endif %}
{% if glance_enable_tls_backend | bool %}
{
"path": "/var/log/kolla/glance-tls-proxy",
@ -48,11 +50,13 @@
"recurse": true
},
{% endif %}
{% if enable_swift | bool and (inventory_hostname in groups['swift-proxy-server'] or inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server']) %}
{
"path": "/var/log/kolla/swift",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true
},
{% endif %}
{
"path": "/var/lib/fluentd/data",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",

View File

@ -0,0 +1,6 @@
---
fixes:
- |
No longer creates directories for haproxy and swift logs where they
are not needed.
`LP#1945070 <https://launchpad.net/bugs/1945070>`__