From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 27 Jul 2018 11:08:59 +0000 (+0400)
Subject: [odl/noha] Simplify net scheme on compute nodes
X-Git-Tag: opnfv-7.0.0~128^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ba5bd9abdab0abe2213f5f80e7ffff123ac2c9c8;p=fuel.git

[odl/noha] Simplify net scheme on compute nodes

Align external network scheme of computes with gateway node
to setup just ovs bridge with physical port plugged in.

Change-Id: Ie7919abc8c1f0a0905764b6354f29ad68d3c6557
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

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 18b73d7ea..65792e35e 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
@@ -49,28 +49,20 @@ parameters:
 {%- endif %}
         external_interface:
           enabled: true
-          type: eth
           name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
           proto: manual
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
+          ovs_port_type: OVSPort
           type: ovs_port
-          mtu: ${_param:interface_mtu}
+          ovs_bridge: br-floating
           bridge: br-floating
-        br-ex:
+        br-floating:
           enabled: true
-          type: bridge
+          type: ovs_bridge
           mtu: ${_param:interface_mtu}
+          proto: static
           address: ${_param:external_address}
           netmask: ${_param:opnfv_net_public_mask}
           use_interfaces:
             - ${_param:external_interface}
-          use_ovs_ports:
-            - float-to-ex
           gateway: ${_param:opnfv_net_public_gw}
           name_servers: {{ nm.dns_public }}