openstack/kolla-ansible
Code Issues Proposed changes

Merge "Set fluentd output to elasticsearch to use elasticsearch_address"

Browse Source
This commit is contained in:
Jenkins 2017-04-18 14:56:51 +00:00 committed by Gerrit Code Review
commit 679009348e
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,8 @@
- name: "00-local" - name: "00-local"
enabled: true enabled: true
- name: "01-es" - 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 - name: Copying over fluentd format config files
template: template:

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

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

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

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

3
ansible/roles/common/templates/fluentd.json.j2
View File

@ -60,7 +60,8 @@
"dest": "/etc/td-agent/format/wsgi_python.conf", "dest": "/etc/td-agent/format/wsgi_python.conf",
"owner": "td-agent", "owner": "td-agent",
"perm": "0600" "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", "source": "{{ container_config_directory }}/output/01-es.conf",
"dest": "/etc/td-agent/output/01-es.conf", "dest": "/etc/td-agent/output/01-es.conf",