Skip to content

Commit 085a085

Browse files
Scott Shambargermarkgoddard
authored andcommitted
fluentd: Fix check for external elasticsearch
When enable_elasticsearch is False, and kolla_internal_fqdn is set and elasticsearch_address is the default, fluentd is still enabling output to elasticsearch. elasticsearch_address defaults to kolla_internal_fqdn, but the check to enable logging to an "external" elasticsearch host compares with kolla_internal_vip_address (fqdn != vip address). This patch fixes the comparison to use the kolla_internal_fqdn. Closes-Bug: #1927880 Change-Id: If23a6b1273c2639d1296becc9d222546d52f63ac (cherry picked from commit 283b0de)
1 parent 10359de commit 085a085

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ansible/roles/common/tasks/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
vars:
112112
log_direct_to_elasticsearch: >-
113113
{{ ( enable_elasticsearch | bool or
114-
( elasticsearch_address != kolla_internal_vip_address )) and
114+
( elasticsearch_address != kolla_internal_fqdn )) and
115115
not enable_monasca | bool }}
116116
fluentd_version: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_version | default('0.12') }}"
117117
# Inputs
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes elasticsearch fluentd output being enabled when
5+
elasticsearch is not enabled.
6+
`LP#1927880 <https://launchpad.net/bugs/1927880>`__

0 commit comments

Comments
 (0)