From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 2 Aug 2017 09:10:26 +0000 (+0400)
Subject: [odl-router] Bring up public network on computes
X-Git-Tag: opnfv-5.0.RC1~154
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F38597%2F1;p=fuel.git

[odl-router] Bring up public network on computes

* apply provider mappings on compute nodes as well
* set default route of computes to gateway node

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

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
index e25f41742..ba710a36e 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
@@ -46,9 +46,11 @@ parameters:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
       ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640
       tunnel_ip: ${_param:tenant_address}
+      provider_mappings: physnet1:br-floating
   linux:
     network:
       bridge: openvswitch
+      gateway: ${_param:openstack_gateway_address}
       interface:
         dhcp_int:
           enabled: true
@@ -68,6 +70,12 @@ parameters:
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
         br-mgmt:
           enabled: true
           type: bridge
@@ -82,5 +90,25 @@ parameters:
           proto: static
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
+          gateway: 10.1.0.110
           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}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex