diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-19 08:28:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-04-19 08:28:36 +0000 |
| commit | 82718b6c8d6897228356c2f49afb68e78f60abd3 (patch) | |
| tree | 229ab267189170cfee2fcd43004b4cf8464a1f28 /mcp/reclass/classes/cluster | |
| parent | fce2cf668194a173d767627bd868629024c1f118 (diff) | |
| parent | 5b2ad6fc2bcb56c2e83f78e2012ba4c8899ea2c8 (diff) | |
Merge "[odl] Disable timeout for learnt flows of snat" into stable/hunter
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index 3c8a35e06..51f86b252 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -22,7 +22,9 @@ parameters: java_min_mem: 6g java_max_mem: 6g router_enabled: true - netvirt_nat_mode: conntrack + netvirt_natservice: + nat_mode: conntrack + snat_punt_timeout: 0 karaf_features: odl_default: - odl-restconf-all diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 index 7b8cf2017..0c504a264 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 @@ -22,7 +22,9 @@ parameters: java_min_mem: 4g java_max_mem: 4g router_enabled: true - netvirt_nat_mode: conntrack + netvirt_natservice: + nat_mode: conntrack + snat_punt_timeout: 0 karaf_features: odl_default: - odl-restconf-all |