epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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:
kyrie
2024-12-24 22:50:11 +08:00
committed by GitHub
parent 6c69ffed5b
commit e7a5e3ca5c
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
roles/reset/defaults/main.yml
View File

@@ -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