Merge "Removing duplicate hostip entry"
diff --git a/opencontrail/common.sls b/opencontrail/common.sls
index 009ab26..70e5da0 100644
--- a/opencontrail/common.sls
+++ b/opencontrail/common.sls
@@ -26,10 +26,6 @@
sysctl.present:
- value: "/var/crashes/core.%e.%p.%h.%t"
-net.netfilter.nf_conntrack_max:
- sysctl.present:
- - value: 256000
-
{% if not pillar.opencontrail.compute is defined %}
net.netfilter.nf_conntrack_tcp_timeout_time_wait:
@@ -63,22 +59,6 @@
sysctl.present:
- value: 1000
-net.ipv4.tcp_keepalive_time:
- sysctl.present:
- - value: 5
-
-net.ipv4.tcp_keepalive_probes:
- sysctl.present:
- - value: 5
-
-net.ipv4.tcp_keepalive_intvl:
- sysctl.present:
- - value: 1
-
-fs.file-max:
- sysctl.present:
- - value: 124165
-
security_limits_conf:
cmd.run:
- names: