openstack/kolla-ansible
Code Issues Proposed changes

Fix genconfig for kolla-kubernetes

Browse Source 
This PS fixes some bugs that causes trunk not to work for
kolla-kubernetes.

Change-Id: I4eaba87c9c75a85ac16823a77ab197e62254e66e
This commit is contained in:
Kevin Fox 2017-01-31 11:39:20 -08:00
parent 463e5a2f1c
commit cac3ed855c
2 changed files with 6 additions and 0 deletions
ansible/roles
common/templates/conf/input
01-syslog.conf.j2
haproxy/templates
haproxy.cfg.j2

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

@ -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

@ -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 %}