Browse Source

Merge "Set up local logging for lrmd"

Jenkins 2 years ago
parent
commit
472a590d61

+ 7
- 4
deployment/puppet/openstack/templates/02-ha.conf.erb View File

@@ -1,6 +1,11 @@
1 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
5
+if $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
4 9
 if ($programname == 'lrmd' \
5 10
   or $programname == 'pengine' \
6 11
   or $programname == 'stonith-ng' \
@@ -10,6 +15,4 @@ if ($programname == 'lrmd' \
10 15
   or $programname == 'crmd' \
11 16
   or $programname == 'crm_verify' \
12 17
   or $programname == 'corosync') \
13
-then -/var/log/pacemaker.log
14
-### stop further processing for the matched entries
15
-& stop
18
+then stop

+ 1
- 0
deployment/puppet/openstack/templates/10-fuel.conf.erb View File

@@ -23,6 +23,7 @@
23 23
 "/var/log/dnsmasq.log"
24 24
 "/var/log/fuelmenu.log"
25 25
 "/var/log/kern.log"
26
+"/var/log/lrmd.log"
26 27
 "/var/log/mail.log"
27 28
 "/var/log/mcollective*.log"
28 29
 "/var/log/messages"

Loading…
Cancel
Save