[minion] Set tcp_keepalive for flaky networks

Workaround issues like [1]. Requires bumping formulas for
salt-formula-salt support of tcp_keepalive_* params.

[1] https://github.com/saltstack/salt/issues/38157

Change-Id: I7093437fb696809f73a24b10144c6321d0f1be32
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
index d8f8569..a802bdc 100644 (file)
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 35 insertions(+), 1 deletion(-)
 
 diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..8ac8f81 100644
+index 2c75586..d7d4c49 100644
 --- a/DockerMake.yml
 +++ b/DockerMake.yml
 @@ -102,12 +102,46 @@ salt-formulas:
@@ -33,7 +33,7 @@ index 2c75586..8ac8f81 100644
      ARG RECLASS_BASE="/srv/salt/reclass"
      ENV RECLASS_BASE $RECLASS_BASE
 -    RUN echo "Layer python/salt module prerequisites, formulas" \
-+    RUN echo "Layer python/salt module prerequisites, formulas (19 Sep 2018)" \
++    RUN echo "Layer python/salt module prerequisites, formulas (25 Sep 2018)" \
        && mkdir -p /srv/salt \
        && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \
        && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2
index 894d3bc..54f2682 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2
@@ -27,3 +27,7 @@ parameters:
     {{key}}: {{ network | ipnet_hostaddr(i) }}
 {%- endfor %}
 {%- endfor %}
+  salt:
+    minion:
+      tcp_keepalive: True
+      tcp_keepalive_idle: 60