diff --git a/ansible/roles/common/templates/conf/output/00-local.conf.j2 b/ansible/roles/common/templates/conf/output/00-local.conf.j2
index 22597cb401..7a13196a70 100644
--- a/ansible/roles/common/templates/conf/output/00-local.conf.j2
+++ b/ansible/roles/common/templates/conf/output/00-local.conf.j2
@@ -43,6 +43,7 @@
        buffer_type file
        buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_swift_facility }}.*
        max_retry_wait 1800s
+       disable_retry_limit true
     </store>
 {% endif %}
 </match>
@@ -94,6 +95,7 @@
        buffer_type file
        buffer_path /var/lib/fluentd/data/monasca.buffer/{{ syslog_haproxy_facility }}.*
        max_retry_wait 1800s
+       disable_retry_limit true
     </store>
 {% endif %}
 </match>
diff --git a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2 b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
index 88039b4360..f4ed33e0c0 100644
--- a/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
+++ b/ansible/roles/common/templates/conf/output/02-monasca.conf.j2
@@ -13,5 +13,6 @@
        buffer_type file
        buffer_path /var/lib/fluentd/data/monasca.buffer/openstack.*
        max_retry_wait 1800s
+       disable_retry_limit true
     </store>
 </match>