1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2019 Mirantis Inc., Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Michael Polenchuk <mpolenchuk@mirantis.com>
10 Date: Wed, 28 Feb 2018 17:54:28 +0400
11 Subject: [PATCH] Set ovs bridges as L3 interfaces
13 diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
15 index 0000000..1322eeb
17 +++ b/linux/files/ovs_bridge
19 +auto {{ bridge_name }}
20 +allow-ovs {{ bridge_name }}
21 +iface {{ bridge_name }} inet {{ bridge.get('proto', 'static' if bridge.address is defined else 'manual') }}
23 + {%- if bridge.address is defined %}
24 + address {{ bridge.address }}
25 + netmask {{ bridge.netmask }}
27 + {%- if bridge.use_interfaces is defined %}
28 + ovs_ports {{ bridge.use_interfaces|join(' ') }}
30 + {%- if bridge.datapath_type is defined %}
31 + ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }}
33 + {%- if bridge.gateway is defined %}
34 + gateway {{ bridge.gateway }}
36 + {%- if bridge.name_servers is defined %}
37 + dns-nameservers {{ bridge.name_servers | join(' ') }}
39 diff --git a/linux/files/ovs_port b/linux/files/ovs_port
40 index 222ca8e..03072cd 100644
41 --- a/linux/files/ovs_port
42 +++ b/linux/files/ovs_port
45 +# With systemd, adding OVS bridges as 'auto' can cause race conditions
46 +# https://github.com/openvswitch/ovs/blob/master/debian/openvswitch-switch.README.Debian
47 +# auto {{ port_name }}
48 allow-{{ port.bridge }} {{ port_name }}
49 iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
50 +{%- if '.' in port_name %}
51 +vlan-raw-device {{ port_name.split('.')[0] }}
53 ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
54 mtu {{ port.get('mtu', '1500') }}
55 ovs_bridge {{ port.bridge }}
56 diff --git a/linux/network/interface.sls b/linux/network/interface.sls
57 index a39fc37..8bce092 100644
58 --- a/linux/network/interface.sls
59 +++ b/linux/network/interface.sls
60 @@ -92,6 +92,35 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}:
61 ovs_bridge_{{ interface_name }}:
62 openvswitch_bridge.present:
63 - name: {{ interface_name }}
65 + - name: /etc/network/interfaces.u/ifcfg-{{ interface_name }}
67 + - source: salt://linux/files/ovs_bridge
69 + bridge: {{ interface|yaml }}
70 + bridge_name: {{ interface_name }}
73 +linux_interfaces_include_{{ interface_name }}:
75 + - name: /etc/network/interfaces
77 + source /etc/network/interfaces.d/*
78 + # Workaround for Upstream-Bug: https://github.com/saltstack/salt/issues/40262
79 + source /etc/network/interfaces.u/*
81 +ovs_bridge_up_{{ interface_name }}:
83 + - name: ifup --ignore-errors {{ interface_name }}
85 + - file: ovs_bridge_{{ interface_name }}
86 + - openvswitch_bridge: ovs_bridge_{{ interface_name }}
87 + - file: linux_interfaces_final_include
88 + {%- if network.noifupdown|d(false) or interface.noifupdown|d(false) %}
89 + - onlyif: /bin/false
91 + - unless: grep -qFx up /sys/class/net/{{ interface_name }}/operstate
94 {# add linux network interface into OVS bridge #}
95 {%- for int_name, int in network.interface.items() %}
96 @@ -102,7 +131,7 @@ ovs_bridge_{{ interface_name }}:
98 add_int_{{ int_name }}_to_ovs_bridge_{{ interface_name }}:
100 - - unless: ovs-vsctl show | grep {{ int_name }}
101 + - unless: ovs-vsctl list-ports {{ interface_name }} | grep -qFx {{ int_name }}
102 - name: ovs-vsctl{%- if network.ovs_nowait %} --no-wait{%- endif %} add-port {{ interface_name }} {{ int_name }}
105 @@ -176,6 +205,9 @@ ovs_port_{{ interface_name }}_line2:
106 ovs_port_up_{{ interface_name }}:
108 - name: ifup {{ interface_name }}
109 + {%- if network.noifupdown|d(false) or interface.noifupdown|d(false) %}
110 + - onlyif: /bin/false
113 - file: ovs_port_{{ interface_name }}
114 - file: ovs_port_{{ interface_name }}_line1