mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-16 22:07:39 -02:30
improve NTP package conflict handling (#12212)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
This commit is contained in:
@@ -1,4 +1,9 @@
|
||||
---
|
||||
pkgs_to_remove:
|
||||
systemd-timesyncd:
|
||||
- "{{ ntp_enabled }}"
|
||||
- "{{ ntp_package == 'ntp' }}"
|
||||
- "{{ ansible_os_family == 'Debian' }}"
|
||||
pkgs:
|
||||
apparmor:
|
||||
- "{{ ansible_os_family == 'Debian' }}"
|
||||
@@ -9,6 +14,9 @@ pkgs:
|
||||
- "{{ ansible_distribution_major_version == '10' }}"
|
||||
- "{{ 'k8s_cluster' in group_names }}"
|
||||
bash-completion: []
|
||||
chrony:
|
||||
- "{{ ntp_enabled }}"
|
||||
- "{{ ntp_package == 'chrony' }}"
|
||||
conntrack:
|
||||
- "{{ ansible_os_family in ['Debian', 'RedHat'] }}"
|
||||
- "{{ ansible_distribution != 'openEuler' }}"
|
||||
@@ -70,6 +78,12 @@ pkgs:
|
||||
- "{{ 'k8s_cluster' in group_names }}"
|
||||
nss:
|
||||
- "{{ ansible_os_family == 'RedHat' }}"
|
||||
ntp:
|
||||
- "{{ ntp_enabled }}"
|
||||
- "{{ ntp_package == 'ntp' }}"
|
||||
ntpsec:
|
||||
- "{{ ntp_enabled }}"
|
||||
- "{{ ntp_package == 'ntpsec' }}"
|
||||
openssl: []
|
||||
python-apt:
|
||||
- "{{ ansible_os_family == 'Debian' }}"
|
||||
|
||||
Reference in New Issue
Block a user