Remove ovs from ovs bridge config
Mentioning 'ovs' in config file for an ovs bridge
leads to a number of issues. Mainly it makes system delete ovs bridge and
all its ports from ovsdb every time on shutdown, and bring all this back
on reboot. This does not work when ovs bridge has non-ovs ports
which is a common case in many MCP deployments.
So on reboot we lose ports and eventually connectivity.
Interface config files for ovs bridges were added to be able
to assign ip address to a bridge and do ifup with no reboot needed
(https://gerrit.mcp.mirantis.com/#/c/29432/) - this should still
be possible with no 'ovs' in bridge config.
Similar change was done with dpdk ovs bridges
(https://gerrit.mcp.mirantis.com/#/c/33666/)
Change-Id: I23cffa661e038f61b7fb5629668d975f8ee237d9
Related-Prod: PROD-26859 (PROD:26859)
diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
index 40acb04..f9bef19 100644
--- a/linux/files/ovs_bridge
+++ b/linux/files/ovs_bridge
@@ -1,6 +1,5 @@
auto {{ bridge_name }}
iface {{ bridge_name }} inet {{ bridge.get('proto', 'static' if bridge.address is defined else 'manual') }}
-ovs_type {{ bridge.get('ovs_bridge_type', 'OVSBridge') }}
mtu {{ bridge.get('mtu', '1500') }}
{%- if bridge.address is defined %}
address {{ bridge.address }}
@@ -9,9 +8,3 @@
{%- if bridge.gateway is defined %}
gateway {{ bridge.gateway }}
{%- endif %}
-{%- if bridge.ovs_options is defined %}
-ovs_options {{ bridge.ovs_options }}
-{%- endif %}
-{%- if bridge_ports %}
-ovs_ports {{ bridge_ports }}
-{%- endif %}
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 4794a51..771bd5e 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -95,8 +95,6 @@
openvswitch_bridge.present:
- name: {{ interface_name }}
-{%- set ovs_ports = [] %}
-
{# add linux network interface into OVS bridge #}
{%- for int_name, int in network.interface.items() %}
@@ -110,10 +108,6 @@
- name: ovs-vsctl{%- if network.ovs_nowait %} --no-wait{%- endif %} add-port {{ interface_name }} {{ int_name }}
{%- endif %}
-{%- if int.bridge is defined and interface_name == int.bridge %}
-{%- do ovs_ports.append(int_name) %}
-{%- endif %}
-
{%- endfor %}
linux_interfaces_include_{{ interface_name }}:
@@ -132,7 +126,6 @@
- defaults:
bridge: {{ interface|yaml }}
bridge_name: {{ interface_name }}
- bridge_ports: {{ " ".join(ovs_ports) }}
- template: jinja
ovs_bridge_up_{{ interface_name }}: