Merge "[baremetal] Migrate public bridge to ovs" into stable/euphrates

1 files changed, 25 insertions, 10 deletions

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 687777b2c..cad407f57 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,6 +27,8 @@
     {%- 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' -%}
@@ -90,18 +92,31 @@ 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: bridge
+          type: ovs_bridge
           mtu: ${_param:interface_mtu}
           address: ${_param:external_address}
           netmask: 255.255.255.0
-          use_interfaces:
-            - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %}
-          use_ovs_ports:
-            - float-to-ex
+          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