aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉric Lemoine <elemoine@mirantis.com>2016-02-11 12:53:33 +0100
committerSamYaple <sam@yaple.net>2016-02-19 21:49:21 +0000
commit0251ac73d538d1c37acafb62ff4b11c91e4ad914 (patch)
treeda1d55f83b6392d11e85bb32679ef4a969d6c71e
parent5de471f61edf7da39110633a78b0bedfa95836bf (diff)
downloadkolla-0251ac73d538d1c37acafb62ff4b11c91e4ad914.tar.gz
kolla-0251ac73d538d1c37acafb62ff4b11c91e4ad914.zip
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
-rw-r--r--ansible/roles/common/tasks/start.yml2
-rw-r--r--ansible/roles/common/templates/rsyslog.conf.j23
-rw-r--r--docker/kolla-toolbox/ansible.cfg1
3 files changed, 2 insertions, 4 deletions
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index 3c113d857..23a41ffa2 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 b808c0743..57ae17d8e 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 c45b65ae1..53708de39 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