summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-15 08:44:24 +0000
committerGerrit Code Review <review@openstack.org>2017-03-15 08:44:24 +0000
commit472a590d61833389db80fab480d7d6d26f5ecbc8 (patch)
tree6a8457b1846c7cb8439677475dfe53df20068c49
parente7f96fefc8d1b35ccc20f6dbd870671b3d6f6288 (diff)
parent4d18ef0dadedb05e4876b42123a11a0121f5f708 (diff)
Merge "Set up local logging for lrmd"
-rw-r--r--deployment/puppet/openstack/templates/02-ha.conf.erb11
-rw-r--r--deployment/puppet/openstack/templates/10-fuel.conf.erb1
2 files changed, 8 insertions, 4 deletions
diff --git a/deployment/puppet/openstack/templates/02-ha.conf.erb b/deployment/puppet/openstack/templates/02-ha.conf.erb
index fe64293..2a9c421 100644
--- a/deployment/puppet/openstack/templates/02-ha.conf.erb
+++ b/deployment/puppet/openstack/templates/02-ha.conf.erb
@@ -1,6 +1,11 @@
1# managed by puppet 1# managed by puppet
2 2
3### collect HA logs of all levels in /var/log/pacemaker.log 3### Collect lrmd logs separately as
4### they are not collected in pacemaker.log
5if $programname == 'lrmd' then -/var/log/lrmd.log
6
7### Pacemaker already writes logs to /var/log/pacemaker.log
8### So no need to process these further
4if ($programname == 'lrmd' \ 9if ($programname == 'lrmd' \
5 or $programname == 'pengine' \ 10 or $programname == 'pengine' \
6 or $programname == 'stonith-ng' \ 11 or $programname == 'stonith-ng' \
@@ -10,6 +15,4 @@ if ($programname == 'lrmd' \
10 or $programname == 'crmd' \ 15 or $programname == 'crmd' \
11 or $programname == 'crm_verify' \ 16 or $programname == 'crm_verify' \
12 or $programname == 'corosync') \ 17 or $programname == 'corosync') \
13then -/var/log/pacemaker.log 18then stop
14### stop further processing for the matched entries
15& stop
diff --git a/deployment/puppet/openstack/templates/10-fuel.conf.erb b/deployment/puppet/openstack/templates/10-fuel.conf.erb
index e9d02ee..fb58faa 100644
--- a/deployment/puppet/openstack/templates/10-fuel.conf.erb
+++ b/deployment/puppet/openstack/templates/10-fuel.conf.erb
@@ -23,6 +23,7 @@
23"/var/log/dnsmasq.log" 23"/var/log/dnsmasq.log"
24"/var/log/fuelmenu.log" 24"/var/log/fuelmenu.log"
25"/var/log/kern.log" 25"/var/log/kern.log"
26"/var/log/lrmd.log"
26"/var/log/mail.log" 27"/var/log/mail.log"
27"/var/log/mcollective*.log" 28"/var/log/mcollective*.log"
28"/var/log/messages" 29"/var/log/messages"