mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Mirantis Inc., Enea AB and others.
   3 :
   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
  12
  13 Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499
  14
  15 diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
  16 new file mode 100644
  17 index 0000000..c609e45
  18 --- /dev/null
  19 +++ b/linux/files/ovs_bridge
  20 @@ -0,0 +1,13 @@
  21 +auto {{ bridge_name }}
  22 +allow-ovs {{ bridge_name }}
  23 +iface {{ bridge_name }} inet static
  24 +  ovs_type OVSBridge
  25 +  address {{ bridge.address }}
  26 +  netmask {{ bridge.netmask }}
  27 +  mtu {{ bridge.get('mtu', '1500') }}
  28 +  {%- if bridge.use_interfaces is defined %}
  29 +  ovs_ports {{ bridge.use_interfaces|join(' ') }}
  30 +  {%- endif %}
  31 +  {%- if bridge.datapath_type is defined %}
  32 +  ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }}
  33 +  {%- endif %}
  34 diff --git a/linux/files/ovs_port b/linux/files/ovs_port
  35 index 222ca8e..efb0307 100644
  36 --- a/linux/files/ovs_port
  37 +++ b/linux/files/ovs_port
  38 @@ -1,6 +1,11 @@
  39 +# With systemd, adding OVS bridges as 'auto' can cause race conditions
  40 +# https://github.com/openvswitch/ovs/blob/master/debian/openvswitch-switch.README.Debian
  41 +# auto {{ port_name }}
  42 -auto {{ port_name }}
  43  allow-{{ port.bridge }} {{ port_name }}
  44  iface {{ port_name }} inet {{ port.get('proto', 'manual') }}
  45 +{%- if '.' in port_name %}
  46 +vlan-raw-device {{ port_name.split('.')[0] }}
  47 +{%- endif %}
  48  ovs_type {{ port.get('ovs_port_type', 'OVSIntPort') }}
  49  mtu {{ port.get('mtu', '1500') }}
  50  ovs_bridge {{ port.bridge }}
  51 diff --git a/linux/network/interface.sls b/linux/network/interface.sls
  52 index 180f912..dcb295b 100644
  53 --- a/linux/network/interface.sls
  54 +++ b/linux/network/interface.sls
  55 @@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}:
  56  ovs_bridge_{{ interface_name }}:
  57    openvswitch_bridge.present:
  58    - name: {{ interface_name }}
  59 +{%- if interface.get('proto', 'manual') == 'static' %}
  60 +  file.managed:
  61 +  - name: /etc/network/interfaces.u/ifcfg-{{ interface_name }}
  62 +  - makedirs: True
  63 +  - source: salt://linux/files/ovs_bridge
  64 +  - defaults:
  65 +      bridge: {{ interface|yaml }}
  66 +      bridge_name: {{ interface_name }}
  67 +  - template: jinja
  68 +
  69 +linux_interfaces_include_{{ interface_name }}:
  70 +  file.prepend:
  71 +  - name: /etc/network/interfaces
  72 +  - text: |
  73 +      source /etc/network/interfaces.d/*
  74 +      # Workaround for Upstream-Bug: https://github.com/saltstack/salt/issues/40262
  75 +      source /etc/network/interfaces.u/*
  76 +
  77 +ovs_bridge_up_{{ interface_name }}:
  78 +  cmd.run:
  79 +  - name: ifup {{ interface_name }}
  80 +  - require:
  81 +    - file: ovs_bridge_{{ interface_name }}
  82 +    - openvswitch_bridge: ovs_bridge_{{ interface_name }}
  83 +    - file: linux_interfaces_final_include
  84 +  - unless:
  85 +    - ip link show {{ interface_name }} | grep -q '\<UP\>'
  86 +{%- endif %}
  87
  88  {# add linux network interface into OVS bridge #}
  89  {%- for int_name, int in network.interface.items() %}