summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-26 11:57:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-26 11:57:35 +0000
commit10dcc4cf9d03f3e6d45e7a8eb3eda7030f9ffd3a (patch)
treeea2d08f84b08ac818458cec483066b928cbd6314
parentd2375b955235618f66d5379e53466e6bc6085b2e (diff)
parent349398b5c51e8a48c9c861580d19458cf244224f (diff)
Merge "[minion] Set tcp_keepalive for flaky networks" into stable/gambia
-rw-r--r--mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j24
2 files changed, 6 insertions, 2 deletions
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 d8f85691e..a802bdcc8 100644
--- 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 894d3bcc6..54f268226 100644
--- 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