From 0251ac73d538d1c37acafb62ff4b11c91e4ad914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <elemoine@mirantis.com>
Date: Thu, 11 Feb 2016 12:53:33 +0100
Subject: [PATCH] Make Ansible write its logs into "kolla_logs"

The Ansible logs are currently not collected by Heka.  This can be
done later, with an Ansible-specific decoder for Heka.

Partially implements: blueprint heka
Change-Id: I8d3ba4edb527f61c0a8234024b4be953c6e6c565
---
 ansible/roles/common/tasks/start.yml           | 2 +-
 ansible/roles/common/templates/rsyslog.conf.j2 | 3 ---
 docker/kolla-toolbox/ansible.cfg               | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index 3c113d8570..23a41ffa26 100644
--- a/ansible/roles/common/tasks/start.yml
+++ b/ansible/roles/common/tasks/start.yml
@@ -39,4 +39,4 @@
     volumes:
       - "/dev/:/dev/"
       - "/run/:/run/"
-      - "rsyslog_socket:/var/lib/kolla/rsyslog/"
+      - "kolla_logs:/var/log/kolla/"
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index b808c07431..57ae17d8ed 100644
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -7,9 +7,6 @@ $KLogPermitNonKernelFacility on
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $RepeatedMsgReduction on
 
-$template KollaToolboxFile,"/var/log/kolla_toolbox.log"
-:syslogtag,contains,"toolbox" ?KollaToolboxFile
-
 $template HeatAPIFile,"/var/log/heat/heat-api.log"
 :syslogtag,contains,"heat-api" ?HeatAPIFile
 
diff --git a/docker/kolla-toolbox/ansible.cfg b/docker/kolla-toolbox/ansible.cfg
index c45b65ae1c..53708de396 100644
--- a/docker/kolla-toolbox/ansible.cfg
+++ b/docker/kolla-toolbox/ansible.cfg
@@ -1,2 +1,3 @@
 [defaults]
 remote_tmp = /tmp
+log_path = /var/log/kolla/ansible.log