[virtual/odl] Simplify network scheme on computes

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

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
index 35940d5..c5ba850 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml
@@ -21,32 +21,27 @@ parameters:
           name: ${_param:external_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
-          type: eth
+          ovs_port_type: OVSPort
+          type: ovs_port
+          ovs_bridge: br-floating
+          bridge: br-floating
         br-mesh:
           enabled: true
           type: bridge
           proto: static
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
-          gateway: ${_param:opnfv_openstack_gateway_node01_tenant_address}
           use_interfaces:
             - ${_param:tenant_interface}
         br-floating:
           enabled: true
           type: ovs_bridge
           mtu: ${_param:interface_mtu}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
+          proto: static
           address: ${_param:external_address}
           netmask: 255.255.255.0
-          use_interfaces:
-            - ${_param:external_interface}
-          use_ovs_ports:
-            - float-to-ex
+          route:
+            public:
+              address: 0.0.0.0
+              netmask: 0.0.0.0
+              gateway: ${_param:opnfv_net_public_gw}