mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-01-09 23:12:10 -03:30
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>
This commit is contained in:
parent
6c69ffed5b
commit
e7a5e3ca5c
@ -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
|
||||
|
||||
@ -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') }}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user