1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2018 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 Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499
15 linux/files/ovs_bridge | 18 ++++++++++++++++++
16 linux/files/ovs_port | 7 ++++++-
17 linux/network/interface.sls | 28 ++++++++++++++++++++++++++++
18 3 files changed, 52 insertions(+), 1 deletion(-)
19 create mode 100644 linux/files/ovs_bridge
21 diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
23 index 0000000..d33864c
25 +++ b/linux/files/ovs_bridge
27 +auto {{ bridge_name }}
28 +allow-ovs {{ bridge_name }}
29 +iface {{ bridge_name }} inet static
31 + address {{ bridge.address }}
32 + netmask {{ bridge.netmask }}
33 + {%- if bridge.use_interfaces is defined %}
34 + ovs_ports {{ bridge.use_interfaces|join(' ') }}
36 + {%- if bridge.datapath_type is defined %}
37 + ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }}
39 + {%- if bridge.gateway is defined %}
40 + gateway {{ bridge.gateway }}
42 + {%- if bridge.name_servers is defined %}
43 + dns-nameservers {{ bridge.name_servers | join(' ') }}
45 diff --git a/linux/files/ovs_port b/linux/files/ovs_port
46 index 222ca8e..03072cd 100644
47 --- a/linux/files/ovs_port
48 +++ b/linux/files/ovs_port
51 +# With systemd, adding OVS bridges as 'auto' can cause race conditions
52 +# https://github.com/openvswitch/ovs/blob/master/debian/openvswitch-switch.README.Debian
53 +# auto {{ port_name }}
54 allow-{{ port.bridge }} {{ port_name }}
55 iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
56 +{%- if '.' in port_name %}
57 +vlan-raw-device {{ port_name.split('.')[0] }}
59 ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
60 mtu {{ port.get('mtu', '1500') }}
61 ovs_bridge {{ port.bridge }}
62 diff --git a/linux/network/interface.sls b/linux/network/interface.sls
63 index c2d2a23..7efdc80 100644
64 --- a/linux/network/interface.sls
65 +++ b/linux/network/interface.sls
66 @@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}:
67 ovs_bridge_{{ interface_name }}:
68 openvswitch_bridge.present:
69 - name: {{ interface_name }}
70 +{%- if interface.get('proto', 'manual') == 'static' %}
72 + - name: /etc/network/interfaces.u/ifcfg-{{ interface_name }}
74 + - source: salt://linux/files/ovs_bridge
76 + bridge: {{ interface|yaml }}
77 + bridge_name: {{ interface_name }}
80 +linux_interfaces_include_{{ interface_name }}:
82 + - name: /etc/network/interfaces
84 + source /etc/network/interfaces.d/*
85 + # Workaround for Upstream-Bug: https://github.com/saltstack/salt/issues/40262
86 + source /etc/network/interfaces.u/*
88 +ovs_bridge_up_{{ interface_name }}:
90 + - name: ifup --ignore-errors {{ interface_name }}
92 + - file: ovs_bridge_{{ interface_name }}
93 + - openvswitch_bridge: ovs_bridge_{{ interface_name }}
94 + - file: linux_interfaces_final_include
96 + - ip link show {{ interface_name }} | grep -q '\<UP\>'
99 {# add linux network interface into OVS bridge #}
100 {%- for int_name, int in network.interface.items() %}