summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-09 17:25:27 +0000
committerGerrit Code Review <review@openstack.org>2018-11-09 17:25:27 +0000
commit0bcebebde6e11440f79a277e0ce778e07e2874c0 (patch)
tree9ac15f207739c3178c7ea4bdd6488c584400256b
parentac79d0d09a58251c4f235907ca5d744c7c1a8a4d (diff)
parenta276d1686c7c723bb5e054b56d227a6fd40959d3 (diff)
Merge "Support configuration of custom fluentd inputs"
-rw-r--r--ansible/roles/kolla-openstack/molecule/default/tests/test_default.py1
-rw-r--r--ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py1
-rw-r--r--ansible/roles/kolla-openstack/vars/main.yml5
-rw-r--r--doc/source/configuration/kolla-ansible.rst1
-rw-r--r--releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml4
5 files changed, 12 insertions, 0 deletions
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 8a15d0b..77271cb 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(
28@pytest.mark.parametrize( 28@pytest.mark.parametrize(
29 'path', 29 'path',
30 ['fluentd/filter', 30 ['fluentd/filter',
31 'fluentd/input',
31 'fluentd/output', 32 'fluentd/output',
32 'keystone']) 33 'keystone'])
33def test_service_config_directory(host, path): 34def 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 4e187c7..ed937ef 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(
31 'cinder', 31 'cinder',
32 'designate', 32 'designate',
33 'fluentd/filter', 33 'fluentd/filter',
34 'fluentd/input',
34 'fluentd/output', 35 'fluentd/output',
35 'glance', 36 'glance',
36 'grafana', 37 'grafana',
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 793164f..2b4b4c8 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:
34 dest: "{{ kolla_node_custom_config_path }}/fluentd/filter" 34 dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
35 patterns: "*.conf" 35 patterns: "*.conf"
36 enabled: true 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 # Fluentd outputs. 42 # Fluentd outputs.
38 - src: "{{ kolla_extra_config_path }}/fluentd/output" 43 - src: "{{ kolla_extra_config_path }}/fluentd/output"
39 dest: "{{ kolla_node_custom_config_path }}/fluentd/output" 44 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 8106ca2..96b3a7e 100644
--- a/doc/source/configuration/kolla-ansible.rst
+++ b/doc/source/configuration/kolla-ansible.rst
@@ -151,6 +151,7 @@ which files are supported.
151 ``glance.conf`` Glance configuration. 151 ``glance.conf`` Glance configuration.
152 ``glance/*`` Extended glance configuration. 152 ``glance/*`` Extended glance configuration.
153 ``fluentd/filter`` Fluentd filter configuration. 153 ``fluentd/filter`` Fluentd filter configuration.
154 ``fluentd/input`` Fluentd input configuration.
154 ``fluentd/output`` Fluentd output configuration. 155 ``fluentd/output`` Fluentd output configuration.
155 ``heat.conf`` Heat configuration. 156 ``heat.conf`` Heat configuration.
156 ``heat/*`` Extended heat configuration. 157 ``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 0000000..f9efdf4
--- /dev/null
+++ b/releasenotes/notes/fluentd-custom-inputs-1b911bd229e8a9e4.yaml
@@ -0,0 +1,4 @@
1---
2features:
3 - |
4 Supports fluentd custom input configuration