From cac3ed855c5dd4b059f0bebf58dcbaf486817879 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 31 Jan 2017 11:39:20 -0800 Subject: [PATCH] Fix genconfig for kolla-kubernetes This PS fixes some bugs that causes trunk not to work for kolla-kubernetes. Change-Id: I4eaba87c9c75a85ac16823a77ab197e62254e66e --- ansible/roles/common/templates/conf/input/01-syslog.conf.j2 | 4 ++++ ansible/roles/haproxy/templates/haproxy.cfg.j2 | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 b/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 index d82208b591..41dc7de644 100644 --- a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 +++ b/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 @@ -1,7 +1,11 @@ @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 /^(?.*)$/ diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 54f3d53e8c..0ee4fd4527 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/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 %}