Merge "Use production like interfaces in the gate"

tests/roles/bootstrap-host/tasks/check-requirements.yml

@@ -121,9 +121,11 @@
   tags:
     - check-disk-size
 
-- name: Ensure that the kernel has VXLAN support
+- name: Ensure that the kernel has VXLAN, VLAN, and bonding support
   modprobe:
-    name: vxlan
+    name: "{{ item }}"
     state: present
-  tags:
+  with_items:
-    - check-vxlan
+    - vxlan
+    - bonding
+    - 8021q

tests/roles/bootstrap-host/tasks/prepare_networking.yml

@@ -22,23 +22,61 @@
     systemd_run_networkd: true
     systemd_netdevs:
       - NetDev:
-          Name: dummy0
+          Name: bond0
-          Kind: dummy
+          Kind: bond
+        Bond:
+          Mode: 802.3ad
+          TransmitHashPolicy: layer3+4
+          MIIMonitorSec: 1s
+          LACPTransmitRate: fast
       - NetDev:
-          Name: dummy1
+          Name: bond1
+          Kind: bond
+        Bond:
+          Mode: 802.3ad
+          TransmitHashPolicy: layer3+4
+          MIIMonitorSec: 1s
+          LACPTransmitRate: fast
+
+      - NetDev:
+          Name: dummy0
           Kind: dummy
       - NetDev:
           Name: dummy2
           Kind: dummy
+      - NetDev:
+          Name: dummy1
+          Kind: dummy
       - NetDev:
           Name: dummy3
           Kind: dummy
+
       - NetDev:
-          Name: dummy4
+          Name: bond0.110
-          Kind: dummy
+          Kind: vlan
+        VLAN:
+          Id: 110
       - NetDev:
-          Name: dummy5
+          Name: bond0.120
-          Kind: dummy
+          Kind: vlan
+        VLAN:
+          Id: 120
+      - NetDev:
+          Name: bond0.130
+          Kind: vlan
+        VLAN:
+          Id: 130
+      - NetDev:
+          Name: bond0.140
+          Kind: vlan
+        VLAN:
+          Id: 140
+      - NetDev:
+          Name: bond1.210
+          Kind: vlan
+        VLAN:
+          Id: 210
+
       - NetDev:
           Name: br-mgmt
           Kind: bridge
@@ -51,45 +89,89 @@
       - NetDev:
           Name: br-vlan
           Kind: bridge
+      - NetDev:
+          Name: br-dbaas
+          Kind: bridge
+      - NetDev:
+          Name: br-lbaas
+          Kind: bridge
+
       - NetDev:
           Name: br-vlan-veth
           Kind: veth
         Peer:
           Name: eth12
-      - NetDev:
-          Name: br-dbaas
-          Kind: bridge
       - NetDev:
           Name: br-dbaas-veth
           Kind: veth
         Peer:
           Name: eth13
-      - NetDev:
-          Name: br-lbaas
-          Kind: bridge
       - NetDev:
           Name: br-lbaas-veth
           Kind: veth
         Peer:
           Name: eth14
+
     systemd_networks:
-      - interface: "dummy0"
+      - interface: "bond0"
+        config_overrides:
+          Network:
+            VLAN:
+              ? "bond0.110"
+              ? "bond0.120"
+              ? "bond0.130"
+              ? "bond0.140"
+        mtu: 9000
+
+      - interface: "bond1"
+        bridge: "br-vlan"
+        config_overrides:
+          Network:
+            VLAN:
+              ? "bond1.210"
+        mtu: 9000
+
+      - interface: "bond0.110"
         bridge: "br-mgmt"
+        mtu: 9000
       - interface: "br-mgmt"
         address: "172.29.236.100"
         netmask: "255.255.252.0"
-      - interface: "dummy1"
+
-        bridge: "br-vxlan"
+      - interface: "bond0.120"
-      - interface: "br-vxlan"
-        address: "172.29.240.100"
-        netmask: "255.255.252.0"
-      - interface: "dummy2"
         bridge: "br-storage"
+        mtu: 9000
       - interface: "br-storage"
         address: "172.29.244.100"
         netmask: "255.255.252.0"
-      - interface: "dummy3"
+
-        bridge: "br-vlan"
+      - interface: "bond0.130"
+        bridge: "br-dbaas"
+        mtu: 9000
+      - interface: "br-dbaas"
+        address: "172.29.232.100"
+        netmask: "255.255.252.0"
+      - interface: "br-dbaas-veth"
+        bridge: "br-dbaas"
+        mtu: 9000
+
+      - interface: "bond0.140"
+        bridge: "br-lbaas"
+        mtu: 9000
+      - interface: "br-lbaas"
+        address: "172.29.252.100"
+        netmask: "255.255.252.0"
+      - interface: "br-lbaas-veth"
+        bridge: "br-lbaas"
+        mtu: 9000
+
+      - interface: "bond1.210"
+        bridge: "br-vxlan"
+        mtu: 9000
+      - interface: "br-vxlan"
+        address: "172.29.240.100"
+        netmask: "255.255.252.0"
+
       - interface: "br-vlan"
         config_overrides:
           Network:
@@ -98,20 +180,20 @@
               ? "172.29.248.1/22"
       - interface: "br-vlan-veth"
         bridge: "br-vlan"
-      - interface: "dummy4"
+        mtu: 9000
-        bridge: "br-dbaas"
+
-      - interface: "br-dbaas"
+      - interface: "dummy0"
-        address: "172.29.232.100"
+        bond: "bond0"
-        netmask: "255.255.252.0"
+        mtu: 9000
-      - interface: "br-dbaas-veth"
+      - interface: "dummy2"
-        bridge: "br-dbaas"
+        bond: "bond0"
-      - interface: "dummy5"
+        mtu: 9000
-        bridge: "br-lbaas"
+      - interface: "dummy1"
-      - interface: "br-lbaas"
+        bond: "bond1"
-        address: "172.29.252.100"
+        mtu: 9000
-        netmask: "255.255.252.0"
+      - interface: "dummy3"
-      - interface: "br-lbaas-veth"
+        bond: "bond1"
-        bridge: "br-lbaas"
+        mtu: 9000
   tags:
     - network-config
 
@@ -133,6 +215,8 @@
         execstarts:
           - "-/sbin/iptables -A POSTROUTING -t mangle -p tcp --dport 22 -j CHECKSUM --checksum-fill"
           - "-/sbin/iptables -t nat -A POSTROUTING -o {{ bootstrap_host_public_interface }} -j MASQUERADE"
+          - "-/sbin/ethtool -K bond0 gso off sg off tso off tx off"
+          - "-/sbin/ethtool -K bond1 gso off sg off tso off tx off"
           - "-/sbin/ethtool -K br-mgmt gso off sg off tso off tx off"
           - "-/sbin/ethtool -K br-vxlan gso off sg off tso off tx off"
           - "-/sbin/ethtool -K br-storage gso off sg off tso off tx off"