From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 12 Dec 2017 12:31:38 +0000 (+0400)
Subject: Revert "[baremetal] Migrate public bridge to ovs"
X-Git-Tag: opnfv-5.1.RC1~5
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F48719%2F2;p=fuel.git

Revert "[baremetal] Migrate public bridge to ovs"

Vlan tagging on ovs+linux ports doesn't work as expected.
This reverts commit c3316c713c936b154b979aa985a400f4b791c0cb.

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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2
index cad407f57..687777b2c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2
@@ -27,8 +27,6 @@
     {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
     {%- set vlan_private = conf['net_config']['private']['vlan'] -%}
     {%- set vlan_public = conf['net_config']['public']['vlan'] -%}
-
-    {%- set gateway_public = conf['net_config']['public']['gateway'] -%}
 {%- else -%}
     {%- set nic_admin = 'enp6s0' -%}
     {%- set nic_mgmt = 'enp6s0' -%}
@@ -92,31 +90,18 @@ parameters:
           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: ovs_bridge
+          type: bridge
           mtu: ${_param:interface_mtu}
           address: ${_param:external_address}
           netmask: 255.255.255.0
-          proto: static
-          gateway: {{ gateway_public }}
-        floating-to-ex:
-          enabled: true
-          type: ovs_port
-          port_type: patch
-          bridge: br-floating
-          peer: ex-to-floating
-        ex-to-floating:
-          enabled: true
-          type: ovs_port
-          port_type: patch
-          bridge: br-ex
-          peer: floating-to-ex
-        public_ovs_interface:
-          enabled: true
-          name: {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %}
-          proto: manual
-          ovs_port_type: OVSPort
-          type: ovs_port
-          ovs_bridge: br-ex
-          bridge: br-ex
+          use_interfaces:
+            - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %}
+          use_ovs_ports:
+            - float-to-ex