diff --git a/deployment/puppet/openstack/templates/02-ha.conf.erb b/deployment/puppet/openstack/templates/02-ha.conf.erb
index fe64293a03..2a9c4210c2 100644
--- a/deployment/puppet/openstack/templates/02-ha.conf.erb
+++ b/deployment/puppet/openstack/templates/02-ha.conf.erb
@@ -1,6 +1,11 @@
 # managed by puppet
 
-### collect HA logs of all levels in /var/log/pacemaker.log
+### Collect lrmd logs separately as
+### they are not collected in pacemaker.log
+if $programname == 'lrmd' then -/var/log/lrmd.log
+
+### Pacemaker already writes logs to /var/log/pacemaker.log
+### So no need to process these further
 if ($programname == 'lrmd' \
   or $programname == 'pengine' \
   or $programname == 'stonith-ng' \
@@ -10,6 +15,4 @@ if ($programname == 'lrmd' \
   or $programname == 'crmd' \
   or $programname == 'crm_verify' \
   or $programname == 'corosync') \
-then -/var/log/pacemaker.log
-### stop further processing for the matched entries
-& stop
+then stop
diff --git a/deployment/puppet/openstack/templates/10-fuel.conf.erb b/deployment/puppet/openstack/templates/10-fuel.conf.erb
index e9d02eec0e..fb58faa0d9 100644
--- a/deployment/puppet/openstack/templates/10-fuel.conf.erb
+++ b/deployment/puppet/openstack/templates/10-fuel.conf.erb
@@ -23,6 +23,7 @@
 "/var/log/dnsmasq.log"
 "/var/log/fuelmenu.log"
 "/var/log/kern.log"
+"/var/log/lrmd.log"
 "/var/log/mail.log"
 "/var/log/mcollective*.log"
 "/var/log/messages"