Browse Source

Merge "Support configuration of custom fluentd inputs"

tags/5.0.0.0rc1
Zuul 6 months ago
parent
commit
0bcebebde6

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

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

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

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

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

@@ -34,6 +34,11 @@ kolla_openstack_custom_config:
34 34
     dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
35 35
     patterns: "*.conf"
36 36
     enabled: true
37
+  # Fluentd inputs.
38
+  - src: "{{ kolla_extra_config_path }}//fluentd/input"
39
+    dest: "{{ kolla_node_custom_config_path }}/fluentd/input"
40
+    patterns: "*.conf"
41
+    enabled: true
37 42
   # Fluentd outputs.
38 43
   - src: "{{ kolla_extra_config_path }}/fluentd/output"
39 44
     dest: "{{ kolla_node_custom_config_path }}/fluentd/output"

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

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

+ 4
- 0
releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml View File

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

Loading…
Cancel
Save