Fix using the default network manager in reset.yml (#11678)

* enhance reset network service Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io> * reset network service: use systemd module directly --------- Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io> Co-authored-by: Max Gautier <mg@max.gautier.name>
kubernetes-sigs · Dec 24, 2024 · e7a5e3c · e7a5e3c
1 parent 6c69ffe
commit e7a5e3c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/roles/reset/defaults/main.yml b/roles/reset/defaults/main.yml
@@ -2,21 +2,5 @@
 flush_iptables: true
 reset_restart_network: true
 
-reset_restart_network_service_name: >-
-  {% if ansible_os_family == "RedHat" -%}
-  {%-
-    if ansible_distribution_major_version | int >= 8
-    or is_fedora_coreos or ansible_distribution in ["Fedora", "Kylin Linux Advanced Server", "TencentOS"] -%}
-  NetworkManager
-  {%- else -%}
-  network
-  {%- endif -%}
-  {%- elif ansible_distribution == "Ubuntu"
-    or (ansible_distribution == "Debian" and ansible_distribution_major_version | int == 12 ) -%}
-  systemd-networkd
-  {%- elif ansible_os_family == "Debian" -%}
-  networking
-  {%- endif %}
-
 # crictl stop container grace period
 cri_stop_containers_grace_period: 0
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
@@ -414,12 +414,27 @@
     - network
 
 - name: Reset | Restart network
-  service:
-    name: "{{ reset_restart_network_service_name }}"
-    state: restarted
   when:
     - ansible_os_family not in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
     - reset_restart_network | bool
   tags:
     - services
     - network
+  block:
+    - name: Gather active network services
+      systemd:
+        name: "{{ item }}"
+      loop:
+        - NetworkManager
+        - systemd-networkd
+        - networking
+        - network
+      register: service_status
+      changed_when: false
+      ignore_errors: true
+
+    - name: Restart active network services
+      systemd:
+        name: "{{ item }}"
+        state: restarted
+      loop: "{{ service_status.results | selectattr('status.ActiveState', '==', 'active') | map(attribute='item') }}"