X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-odl-noha%2Fopenstack%2Fgateway.yml.j2;h=93313adc7c4aa50757cbd7ce93048eb5cf61a6f5;hb=ac7fd699468ad9a02b250e5ef890aff8a03ce1bf;hp=6b445901bba889fd27483faf5d8704e8c26d1a4c;hpb=9d47d1dfc5d3ee4a618b5a4e247774c903dbec50;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
index 6b445901b..93313adc7 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
@@ -7,7 +7,7 @@
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
 {%- import 'net_macros.j2' as ma with context %}
-{%- set vlan_private_start = 0 if conf.MCP_DPDK_MODE else (nm.vlan_private | string).rsplit('-')[0] %}
+{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
 ---
 classes:
   - cluster.mcp-common-noha.openstack_gateway
@@ -17,6 +17,22 @@ parameters:
   linux:
     network:
       interface:
+{%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %}
+        {{ nm.ctl01.nic_private }}:
+          ovs_port_type: OVSPort
+          type: ovs_port
+          bridge: br-prv
+          ovs_bridge: br-prv
+        br-prv:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: ${_param:opnfv_net_private_mask}
+          use_interfaces:
+            - {{ nm.ctl01.nic_private }}
+{%- else %}
         br-mesh:
           enabled: true
           type: bridge
@@ -25,4 +41,5 @@ parameters:
           address: ${_param:tenant_address}
           netmask: ${_param:opnfv_net_private_mask}
           use_interfaces:
-            - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
+            - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }}
+{%- endif %}