diff --git a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py index 8a15d0bc8..77271cb74 100644 --- a/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py +++ b/ansible/roles/kolla-openstack/molecule/default/tests/test_default.py @@ -28,6 +28,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.mark.parametrize( 'path', ['fluentd/filter', + 'fluentd/input', 'fluentd/output', 'keystone']) def test_service_config_directory(host, path): diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py index 4e187c79c..ed937ef35 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py +++ b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py @@ -31,6 +31,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( 'cinder', 'designate', 'fluentd/filter', + 'fluentd/input', 'fluentd/output', 'glance', 'grafana', diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml index 793164f9c..2b4b4c8fc 100644 --- a/ansible/roles/kolla-openstack/vars/main.yml +++ b/ansible/roles/kolla-openstack/vars/main.yml @@ -34,6 +34,11 @@ kolla_openstack_custom_config: dest: "{{ kolla_node_custom_config_path }}/fluentd/filter" patterns: "*.conf" 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. - src: "{{ kolla_extra_config_path }}/fluentd/output" dest: "{{ kolla_node_custom_config_path }}/fluentd/output" diff --git a/doc/source/configuration/kolla-ansible.rst b/doc/source/configuration/kolla-ansible.rst index 8106ca29a..96b3a7e7b 100644 --- a/doc/source/configuration/kolla-ansible.rst +++ b/doc/source/configuration/kolla-ansible.rst @@ -151,6 +151,7 @@ which files are supported. ``glance.conf`` Glance configuration. ``glance/*`` Extended glance configuration. ``fluentd/filter`` Fluentd filter configuration. + ``fluentd/input`` Fluentd input configuration. ``fluentd/output`` Fluentd output configuration. ``heat.conf`` Heat configuration. ``heat/*`` Extended heat configuration. diff --git a/releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml b/releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml new file mode 100644 index 000000000..f9efdf432 --- /dev/null +++ b/releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Supports fluentd custom input configuration