openstack/kayobe
Code Issues Proposed changes

Support configuration of custom fluentd inputs

Browse Source 
It is now possible to configure custom inputs for fluentd by placing files in
etc/kayobe/kolla/config/fluentd/input/ in the kayobe configuration.

Change-Id: I284e6cff0aa7ddd779530a6de2ea9f8dcdce6450
Story: 2003968
Task: 26898
This commit is contained in:
Mark Goddard 2018-10-04 14:03:36 +00:00
parent 89560dd65f
commit a276d1686c
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
View File

@ -28,6 +28,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
@pytest.mark.parametrize( @pytest.mark.parametrize(
'path', 'path',
['fluentd/filter', ['fluentd/filter',
'fluentd/input',
'fluentd/output', 'fluentd/output',
'keystone']) 'keystone'])
def test_service_config_directory(host, path): def test_service_config_directory(host, path):

1
ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
View File

@ -31,6 +31,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
'cinder', 'cinder',
'designate', 'designate',
'fluentd/filter', 'fluentd/filter',
'fluentd/input',
'fluentd/output', 'fluentd/output',
'glance', 'glance',
'grafana', 'grafana',

5
ansible/roles/kolla-openstack/vars/main.yml
View File

@ -34,6 +34,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/fluentd/filter" dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
patterns: "*.conf" patterns: "*.conf"
enabled: true enabled: true
# Fluentd inputs.
- src: "{{ kolla_extra_config_path }}//fluentd/input"
dest: "{{ kolla_node_custom_config_path }}/fluentd/input"
patterns: "*.conf"
enabled: true
# Fluentd outputs. # Fluentd outputs.
- src: "{{ kolla_extra_config_path }}/fluentd/output" - src: "{{ kolla_extra_config_path }}/fluentd/output"
dest: "{{ kolla_node_custom_config_path }}/fluentd/output" dest: "{{ kolla_node_custom_config_path }}/fluentd/output"

1
doc/source/configuration/kolla-ansible.rst
View File

@ -151,6 +151,7 @@ which files are supported.
``glance.conf`` Glance configuration. ``glance.conf`` Glance configuration.
``glance/*`` Extended glance configuration. ``glance/*`` Extended glance configuration.
``fluentd/filter`` Fluentd filter configuration. ``fluentd/filter`` Fluentd filter configuration.
``fluentd/input`` Fluentd input configuration.
``fluentd/output`` Fluentd output configuration. ``fluentd/output`` Fluentd output configuration.
``heat.conf`` Heat configuration. ``heat.conf`` Heat configuration.
``heat/*`` Extended heat configuration. ``heat/*`` Extended heat configuration.

4
releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Supports fluentd custom input configuration