Browse Source

enhance reset network service

Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io>
pull/11678/head
KubeKyrie 1 month ago
parent
commit
9b523bcd4a
2 changed files with 22 additions and 19 deletions
  1. 16
      roles/reset/defaults/main.yml
  2. 25
      roles/reset/tasks/main.yml

16
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

25
roles/reset/tasks/main.yml

@ -414,12 +414,31 @@
- network
- name: Reset | Restart network
service:
name: "{{ reset_restart_network_service_name }}"
state: restarted
become: true
vars:
network_services:
- NetworkManager
- systemd-networkd
- networking
- network
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
# noqa command-instead-of-module
command: systemctl is-active {{ item }}
loop: "{{ network_services }}"
register: service_status
changed_when: false
ignore_errors: true
- name: Restart active network services
systemd:
name: "{{ item.item }}"
state: restarted
loop: "{{ service_status.results }}"
when: item.stdout == "active"
Loading…
Cancel
Save