From e1392c65b417ffd087dd93fe06f8ca6786c372a2 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 5 Nov 2024 09:27:20 +0100
Subject: [PATCH] Fix openEuler packages
conntrack -> conntrack-tools
device-mapper-libs -> device-mapper
---
roles/kubernetes/preinstall/vars/main.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/roles/kubernetes/preinstall/vars/main.yml b/roles/kubernetes/preinstall/vars/main.yml
index 00285b8a7..699a87de5 100644
--- a/roles/kubernetes/preinstall/vars/main.yml
+++ b/roles/kubernetes/preinstall/vars/main.yml
@@ -11,19 +11,21 @@ pkgs:
bash-completion: []
conntrack:
- "{{ ansible_os_family in ['Debian', 'RedHat'] }}"
+ - "{{ ansible_distribution != 'openEuler' }}"
- "{{ 'k8s_cluster' in group_names }}"
conntrack-tools:
- - "{{ ansible_os_family == 'Suse' or ansible_distribution == 'Amazon' }}"
+ - "{{ ansible_os_family == 'Suse' or ansible_distribution in ['Amazon', 'openEuler'] }}"
- "{{ 'k8s_cluster' in group_names }}"
container-selinux:
- "{{ ansible_os_family == 'RedHat' }}"
- "{{ 'k8s_cluster' in group_names }}"
curl: []
device-mapper:
- - "{{ ansible_os_family == 'Suse' }}"
+ - "{{ ansible_os_family == 'Suse' or ansible_distribution == 'openEuler' }}"
- "{{ 'k8s_cluster' in group_names }}"
device-mapper-libs:
- "{{ ansible_os_family == 'RedHat' }}"
+ - "{{ ansible_distribution != 'openEuler' }}"
e2fsprogs: []
ebtables: []
gnupg:
--
GitLab