From 9a49b33704e2701ee042780809be18214bac1c6e Mon Sep 17 00:00:00 2001 From: kkaptanoglu Date: Mon, 10 Aug 2026 11:57:47 +0300 Subject: Fix Fluentd OpenSearch output address Prefer opensearch_address when it is set, allowing Fluentd to reach an external or legacy Elasticsearch/OpenSearch endpoint instead of relying only on the opensearch inventory group. Use opensearch_address only when it differs from kolla_internal_fqdn. This keeps the default VIP deployment using the OpenSearch inventory addresses. Closes-Bug: #2163144 Change-Id: Ibde86a916c4fa764100bf33675f4c416b5179532 Signed-off-by: kkaptanoglu (cherry picked from commit a68e99bbaead4a0415668103fa18a8169101528b) --- ansible/roles/fluentd/templates/conf/output/00-local.conf.j2 | 2 +- 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 %} @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 @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 != '' %} -- cgit v1.2.3