Merge "[docs] Fix build warnings, minor alignments"

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / openstack_gateway_pdf.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index 72c3810..bd62ae9 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
@@ -11,7 +11,7 @@
 {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #}
 {%- set nics = { nm.ctl01.nic_mgmt: True, nm.ctl01.nic_private: True } %}
 {%- set vlans = { nm.vlan_mgmt: nm.ctl01.nic_mgmt } %}
-{%- if 'dpdk' not in conf.cluster.domain and not conf.MCP_DPDK_MODE %}
+{%- if '-ovs-' not in conf.MCP_DEPLOY_SCENARIO %}
 {%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %}
 {%- do vlans.update({ vlan_private_start: nm.ctl01.nic_private }) %}
 {%- endif %}
@@ -42,6 +42,7 @@ parameters:
         ovs_port_{{ nm.ctl01.nic_public }}:
           enabled: true
           name: {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }}
+          mtu: ${_param:interface_mtu}
           proto: manual
           ovs_port_type: OVSPort
           type: ovs_port
@@ -50,7 +51,6 @@ parameters:
         br-floating:
           enabled: true
           type: ovs_bridge
-          mtu: ${_param:interface_mtu}
           proto: static
           address: ${_param:external_address}
           netmask: ${_param:opnfv_net_public_mask}
@@ -58,6 +58,7 @@ parameters:
             - {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }}
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}
+          noifupdown: true
         br-mgmt:
           enabled: true
           type: bridge