do not use netplan to create team0

To avoid a bug a Netplan durring OVS cleanup step that reset the RSTP configuration of the bridge that is already configured, we decided to not use Netplan to create the team0 interface. The team0 bridge is now created in anycase by the systemd-networkd. Signed-off-by: Mathieu Dupré <[email protected]>
seapath · Dec 4, 2024 · e37d8a0 · e37d8a0
1 parent 36d119b
commit e37d8a0
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 45 deletions.
diff --git a/inventories/netplan_cluster_example.yaml.j2 b/inventories/netplan_cluster_example.yaml.j2
diff --git a/inventories/seapath_cluster_definition_example.yml b/inventories/seapath_cluster_definition_example.yml
@@ -15,7 +15,6 @@ all:
                             netplan_configurations :
                              - inventories/netplan_admin_br0_example.yaml.j2
                              - inventories/netplan_ptp_interface_example.yaml.j2
-                             - inventories/netplan_cluster_example.yaml.j2
 
                             # Main network configuration
                             network_interface: eno8303 #admin interface
@@ -60,7 +59,6 @@ all:
                             netplan_configurations :
                              - inventories/netplan_admin_br0_example.yaml.j2
                              - inventories/netplan_ptp_interface_example.yaml.j2
-                             - inventories/netplan_cluster_example.yaml.j2
 
                             # Main network configuration
                             network_interface: eno8303
@@ -96,10 +94,9 @@ all:
                             ansible_host: 10.10.10.3
                             hostname: "node3"
 
-                            netplan_configurations :
+                            netplan_configurations:
                              - inventories/netplan_admin_br0_example.yaml.j2
                              - inventories/netplan_ptp_interface_example.yaml.j2
-                             - inventories/netplan_cluster_example.yaml.j2
 
                             # Main network interface configuration
                             network_interface: eno8303

diff --git a/playbooks/seapath_setup_network.yaml b/playbooks/seapath_setup_network.yaml
@@ -11,8 +11,10 @@
     - standalone_machine
   become: true
   gather_facts: true
-  vars_files:
-    - ../vars/network_vars.yml
+  pre_tasks:
+    - name: Dynamically include network configuration variables
+      include_vars:
+        file: "../vars/network_{{ 'team_only_' if netplan_configurations is defined or (network_simple is defined and network_simple) else '' }}vars.yml"
   roles:
     - role: network_basics
     - role: systemd_networkd

diff --git a/roles/network_clusternetwork/tasks/main.yml b/roles/network_clusternetwork/tasks/main.yml
@@ -32,7 +32,6 @@
   when:
     - cluster_protocol is not defined or cluster_protocol != "HSR" or hsr_mac_address is not defined
     - skip_recreate_team0_config is not defined or skip_recreate_team0_config is not true
-    - netplan_configurations is not defined
 - block:
   - name: copy hsr.sh script
     template:
@@ -71,4 +70,3 @@
       state: restarted
     when: hsr1.changed or hsr2.changed or hsr3.changed or hsrservice.changed
   when: cluster_protocol is defined and cluster_protocol == "HSR" and hsr_mac_address is defined
-
diff --git a/vars/network_team_only_vars.yml b/vars/network_team_only_vars.yml
@@ -0,0 +1,29 @@
+# Copyright (C) 2021, RTE (http://www.rte-france.com)
+# Copyright (C) 2024 Savoir-faire Linux, Inc.
+# SPDX-License-Identifier: Apache-2.0
+---
+
+systemd_networkd_network_custom: "{{ custom_network | default({}) }}"
+systemd_networkd_netdev: "{{ custom_netdev | default({}) }}"
+
+team0_systemd_networkd_network:
+  79-team0:
+    - Match:
+        - Name: "team0"
+    - Network:
+        - Address: "{{ cluster_ip_addr|default('0') }}/{{ team0subnet | default(24) }}"
+  79-team0_0:
+    - Match:
+        - Name: "{{ team0_0|default('0') }}"
+    - Link:
+        - MTUBytes: 1800
+  79-team0_1:
+    - Match:
+        - Name: "{{ team0_1|default('0') }}"
+    - Link:
+        - MTUBytes: 1800
+
+
+systemd_networkd_network: "{{ team0_systemd_networkd_network | combine(systemd_networkd_network_custom) if cluster_ip_addr is defined else systemd_networkd_network_custom }}"
+
+...
diff --git a/vars/network_vars.yml b/vars/network_vars.yml
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 
-systemd_networkd_network_custom: "{{ custom_network | default([]) }}"
-systemd_networkd_netdev_custom: "{{ custom_netdev | default([]) }}"
+systemd_networkd_network_custom: "{{ custom_network | default({}) }}"
+systemd_networkd_netdev_custom: "{{ custom_netdev | default({}) }}"
 
 br0vlan_systemd_networkd_netdev:
   79-br0: