openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix genconfig for kolla-kubernetes"

Browse Source
This commit is contained in:
Jenkins 2017-02-02 16:25:25 +00:00 committed by Gerrit Code Review
commit 31a96e4f59
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/templates/conf/input/01-syslog.conf.j2
View File

@ -1,7 +1,11 @@
<source>
@type syslog
port {{ fluentd_syslog_port }}
{% if orchestration_engine != 'KUBERNETES' %}
bind {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% else %}
bind 0.0.0.0
{% endif %}
tag syslog
format /^(?<Payload>.*)$/
</source>

2
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -4,7 +4,9 @@ global
user haproxy
group haproxy
daemon
{% if orchestration_engine != 'KUBERNETES' %}
log {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ fluentd_syslog_port }} local1
{% endif %}
maxconn 4000
stats socket /var/lib/kolla/haproxy/haproxy.sock
{% if kolla_enable_tls_external | bool %}