openstack/kolla-ansible
Code Issues Proposed changes

Merge "fluentd: Fix check for external elasticsearch"

Browse Source
This commit is contained in:
Zuul 2021-08-11 14:32:59 +00:00 committed by Gerrit Code Review
commit 61f2bd86b0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/tasks/config.yml
View File

@ -111,7 +111,7 @@
vars: vars:
log_direct_to_elasticsearch: >- log_direct_to_elasticsearch: >-
{{ ( enable_elasticsearch | bool or {{ ( enable_elasticsearch | bool or
( elasticsearch_address != kolla_internal_vip_address )) and ( elasticsearch_address != kolla_internal_fqdn )) and
( not enable_monasca | bool or not monasca_ingest_control_plane_logs | bool ) }} ( not enable_monasca | bool or not monasca_ingest_control_plane_logs | bool ) }}
fluentd_version: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_version | default('0.12') }}" fluentd_version: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_version | default('0.12') }}"
# Inputs # Inputs

6
releasenotes/notes/bug-1927880-cc407f18f415bbd2.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes elasticsearch fluentd output being enabled when
elasticsearch is not enabled.
`LP#1927880 <https://launchpad.net/bugs/1927880>`__