summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j24
-rw-r--r--mcp/salt-formulas/salt-formula-opendaylight/opendaylight/config.sls2
-rw-r--r--mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/netvirt-natservice-config.xml4
4 files changed, 9 insertions, 5 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
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/config.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/config.sls
index 2d23c7563..3f1f81348 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/config.sls
+++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/config.sls
@@ -73,7 +73,7 @@ pax.logging.cfg.{{ opt }}:
ovsdb.of.version: 1.3
{%- endif %}
-{%- if server.netvirt_nat_mode is defined %}
+{%- if server.netvirt_natservice is defined %}
/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-natservice-config.xml:
file.managed:
- source: salt://opendaylight/files/netvirt-natservice-config.xml
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/netvirt-natservice-config.xml b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/netvirt-natservice-config.xml
index 266689e5c..35994e51d 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/netvirt-natservice-config.xml
+++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/files/netvirt-natservice-config.xml
@@ -18,6 +18,6 @@
under the License.
-->
<natservice-config xmlns="urn:opendaylight:netvirt:natservice:config">
- <nat-mode>{{ server.netvirt_nat_mode }}</nat-mode>
- <snat-punt-timeout>5</snat-punt-timeout>
+ <nat-mode>{{ server.netvirt_natservice.nat_mode|d('controller') }}</nat-mode>
+ <snat-punt-timeout>{{ server.netvirt_natservice.snat_punt_timeout|d('5') }}</snat-punt-timeout>
</natservice-config>