C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

calico: fix NetworkManager check (#7169)

Browse source 
Previous check for presence of NM assumed "systemctl show
NetworkManager" would exit with a nonzero status code, which seems not
the case anymore with recent Flatcar Container Linux.

This new check also checks the activeness of network manager, as
`is-active` implies presence.

Signed-off-by Jorik Jonker <jorik@kippendief.biz>

(cherry picked from commit bba55faae8)
This commit is contained in:
Jorik Jonker 2021-01-26 08:52:34 +01:00 committed by Kubernetes Prow Robot
parent 782c3dc1c4
commit 6b184905e6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network_plugin/calico/tasks/install.yml
View file

@ -8,7 +8,7 @@
- name: Calico | Check if host has NetworkManager - name: Calico | Check if host has NetworkManager
# noqa 303 Should we use service_facts for this? # noqa 303 Should we use service_facts for this?
command: systemctl show NetworkManager command: systemctl is-active --quiet NetworkManager.service
register: nm_check register: nm_check
failed_when: false failed_when: false
changed_when: false changed_when: false