diff options
| author | Zuul <zuul@review.opendev.org> | 2026-10-22 12:14:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-10-22 12:14:50 +0000 |
| commit | 6de82f8b4b1794ea4e3b2c8f5ff3649dce0719c7 (patch) | |
| tree | 24e788ce128a1b8b107ab29f73c5580de8eef186 | |
| parent | 15ce36696a21356eb59abb4473e210f13cf7c98c (diff) | |
| parent | 9a49b33704e2701ee042780809be18214bac1c6e (diff) | |
| download | kolla-ansible-6de82f8b4b1794ea4e3b2c8f5ff3649dce0719c7.tar.gz kolla-ansible-6de82f8b4b1794ea4e3b2c8f5ff3649dce0719c7.zip | |
Merge "Fix Fluentd OpenSearch output address" into stable/2026.1
| -rw-r--r-- | ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/fluentd/templates/conf/output/03-opensearch.conf.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 b/ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 index dce221080..924dcc316 100644 --- a/ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 +++ b/ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 @@ -51,7 +51,7 @@ {% elif log_direct_to_opensearch %} <store> @type opensearch - hosts {% for host in groups['opensearch'] %}{{ 'api' | kolla_address(host) }}{% if not loop.last %},{% endif %}{% endfor %} + hosts {% if opensearch_address is defined and opensearch_address != kolla_internal_fqdn %}{{ opensearch_address }}{% else %}{% for host in groups['opensearch'] %}{{ 'api' | kolla_address(host) }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} port {{ opensearch_port }} scheme {{ fluentd_opensearch_scheme }} {% if fluentd_opensearch_path != '' %} diff --git a/ansible/roles/fluentd/templates/conf/output/03-opensearch.conf.j2 b/ansible/roles/fluentd/templates/conf/output/03-opensearch.conf.j2 index 1d814a2e6..dd5f38419 100644 --- a/ansible/roles/fluentd/templates/conf/output/03-opensearch.conf.j2 +++ b/ansible/roles/fluentd/templates/conf/output/03-opensearch.conf.j2 @@ -3,7 +3,7 @@ @type copy <store> @type opensearch - hosts {% for host in groups['opensearch'] %}{{ 'api' | kolla_address(host) }}{% if not loop.last %},{% endif %}{% endfor %} + hosts {% if opensearch_address is defined and opensearch_address != kolla_internal_fqdn %}{{ opensearch_address }}{% else %}{% for host in groups['opensearch'] %}{{ 'api' | kolla_address(host) }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} port {{ opensearch_port }} scheme {{ fluentd_opensearch_scheme }} {% if fluentd_opensearch_user != '' and fluentd_opensearch_password != '' %} |