From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 17 Dec 2014 18:06:28 +0000 (+0100)
Subject: Set more aggressive keepalive timings
X-Git-Tag: opnfv-6.0.0~2707
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2f7f4ed50c53e25041bf29d317c5f3358e46e706;p=apex-tripleo-heat-templates.git

Set more aggressive keepalive timings

We want to customize the default kernel keepalive timings and
make them more aggressive to workaround lack of hearbeat support
in the Oslo RabbitMQ client, see:

https://bugs.launchpad.net/oslo.messaging/+bug/856764/comments/19
and
https://bugs.launchpad.net/oslo.messaging/+bug/856764/comments/70

Change-Id: Ieac08f595086acb8dd336e33efc705ee0b8a3a87
Closes-Bug: 1301431
Closes-Bug: 1385240
Closes-Bug: 1385234
---

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 5084e386..f9698209 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -929,6 +929,10 @@ resources:
               - Merge::Map:
                   controller0:
                     {get_attr: [controller0, name]}
+        sysctl:
+          net.ipv4.tcp_keepalive_time: 5
+          net.ipv4.tcp_keepalive_probes: 5
+          net.ipv4.tcp_keepalive_intvl: 1
   controller0SSLDeployment:
     type: OS::Heat::StructuredDeployment
     properties:
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index ae61ec4b..db9e5671 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -658,6 +658,10 @@ resources:
             list_join:
             - ','
             - {get_attr: [Controller, hostname]}
+        sysctl:
+          net.ipv4.tcp_keepalive_time: 5
+          net.ipv4.tcp_keepalive_probes: 5
+          net.ipv4.tcp_keepalive_intvl: 1
 
   MysqlRootPassword:
     type: OS::Heat::RandomString