Browse Source
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>
pull/11798/head
kyrie
5 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
18 additions and
19 deletions
-
roles/reset/defaults/main.yml
-
roles/reset/tasks/main.yml
|
@ -2,21 +2,5 @@ |
|
|
flush_iptables: true |
|
|
flush_iptables: true |
|
|
reset_restart_network: 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 |
|
|
# crictl stop container grace period |
|
|
cri_stop_containers_grace_period: 0 |
|
|
cri_stop_containers_grace_period: 0 |
|
@ -414,12 +414,27 @@ |
|
|
- network |
|
|
- network |
|
|
|
|
|
|
|
|
- name: Reset | Restart network |
|
|
- name: Reset | Restart network |
|
|
service: |
|
|
|
|
|
name: "{{ reset_restart_network_service_name }}" |
|
|
|
|
|
state: restarted |
|
|
|
|
|
when: |
|
|
when: |
|
|
- ansible_os_family not in ["Flatcar", "Flatcar Container Linux by Kinvolk"] |
|
|
- ansible_os_family not in ["Flatcar", "Flatcar Container Linux by Kinvolk"] |
|
|
- reset_restart_network | bool |
|
|
- reset_restart_network | bool |
|
|
tags: |
|
|
tags: |
|
|
- services |
|
|
- services |
|
|
- network |
|
|
- 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') }}" |