X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-odl-noha%2Fopenstack%2Fcompute.yml.j2;h=1c4ee7a19bbeae8f433561b0919e64d517d0e3b7;hb=c57d4c9a8e26c7dcb8f9f1b98c5b5d6d668750a3;hp=e9c91ea91736f37753c43ac7cf09e392b28b1092;hpb=d0c9d6fa1574b918d87015dfa7b0054de4165148;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index e9c91ea91..1c4ee7a19 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -31,6 +31,7 @@ parameters:
           bridge: br-prv
           type: dpdk_ovs_port
           n_rxq: ${_param:dpdk0_n_rxq}
+          mtu: ${_param:interface_mtu}
         br-prv:
           enabled: true
           type: dpdk_ovs_bridge
@@ -39,6 +40,30 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
         {{ nm.cmp001.nic_private }}:
           type: dpdk  # Not a meaningful type, just match 'dpdk' for filtering
+        {{ nm.cmp001.nic_public }}:
+          enabled: true
+          type: eth
+          mtu: ${_param:interface_mtu}
+          proto: manual
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          address: ${_param:external_address}
+          netmask: ${_param:opnfv_net_public_mask}
+          use_interfaces:
+            - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
+          use_ovs_ports:
+            - float-to-ex
+          gateway: ${_param:opnfv_net_public_gw}
+          name_servers: {{ nm.dns_public }}
 {%- else %}
         br-mesh:
           enabled: true
@@ -48,10 +73,10 @@ parameters:
           netmask: ${_param:opnfv_net_private_mask}
           use_interfaces:
             - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }}
-{%- endif %}
         ovs_port_{{ nm.cmp001.nic_public }}:
           enabled: true
           name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
+          mtu: ${_param:interface_mtu}
           proto: manual
           ovs_port_type: OVSPort
           type: ovs_port
@@ -60,7 +85,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}
@@ -68,3 +92,5 @@ parameters:
             - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }}
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}
+          noifupdown: true
+{%- endif %}