Merge "Set fluentd output to elasticsearch to use elasticsearch_address"

ansible/roles/common/tasks/config.yml

@@ -42,7 +42,8 @@
     - name: "00-local"
       enabled: true
     - name: "01-es"
-      enabled: "{{ enable_elasticsearch }}"
+      enabled: "{{ enable_elasticsearch | bool or
+                ( elasticsearch_address != kolla_internal_vip_address ) | bool }}"
 
 - name: Copying over fluentd format config files
   template:

ansible/roles/common/templates/conf/output/00-local.conf.j2

@@ -8,10 +8,11 @@
     append true
     compress gzip
   </store>
-{% if enable_elasticsearch | bool %}
+{% if enable_elasticsearch | bool or
+      elasticsearch_address != kolla_internal_vip_address %}
   <store>
        type elasticsearch
-       host {{ kolla_external_vip_address }}
+       host {{ elasticsearch_address }}
        port {{ elasticsearch_port }}
        logstash_format true
        logstash_prefix flog
@@ -32,10 +33,11 @@
     append true
     compress gzip
   </store>
-{% if enable_elasticsearch | bool %}
+{% if enable_elasticsearch | bool or
+      elasticsearch_address != kolla_internal_vip_address %}
   <store>
        type elasticsearch
-       host {{ kolla_external_vip_address }}
+       host {{ elasticsearch_address }}
        port {{ elasticsearch_port }}
        logstash_format true
        logstash_prefix flog

ansible/roles/common/templates/conf/output/01-es.conf.j2

@@ -2,7 +2,7 @@
     type copy
     <store>
        type elasticsearch
-       host {{ kolla_external_vip_address }} 
+       host {{ elasticsearch_address }}
        port {{ elasticsearch_port }}
        logstash_format true
        logstash_prefix flog

ansible/roles/common/templates/fluentd.json.j2

@@ -60,7 +60,8 @@
             "dest": "/etc/td-agent/format/wsgi_python.conf",
             "owner": "td-agent",
             "perm": "0600"
-        },{% if enable_elasticsearch | bool %}
+        },{% if enable_elasticsearch | bool or
+                ( elasticsearch_address != kolla_internal_vip_address ) | bool %}
         {
             "source": "{{ container_config_directory }}/output/01-es.conf",
             "dest": "/etc/td-agent/output/01-es.conf",