Merge "fluentd: Fix check for external elasticsearch" into stable/victoria

Author: Zuul

ansible/roles/common/tasks/config.yml

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

releasenotes/notes/bug-1927880-cc407f18f415bbd2.yaml

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