Skip to content

Commit

Permalink
enhance reset network service
Browse files Browse the repository at this point in the history
Signed-off-by: KubeKyrie <shaolong.qin@daocloud.io>
  • Loading branch information
KubeKyrie committed Nov 1, 2024
1 parent 5aea2ab commit 0df2560
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
16 changes: 0 additions & 16 deletions roles/reset/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 21 additions & 3 deletions roles/reset/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,27 @@
- network

- name: Reset | Restart network
service:
name: "{{ reset_restart_network_service_name }}"
state: restarted
become: yes
vars:
network_services:
- NetworkManager
- systemd-networkd
- networking
- network
block:
- name: Gather active network services
shell: "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"
when:
- ansible_os_family not in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
- reset_restart_network | bool
Expand Down

0 comments on commit 0df2560

Please sign in to comment.