External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 18:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix kubespray flatcar ansible_os_family and ansible_distribution (#8181)

Browse Source 
Closes https://github.com/kubernetes-sigs/kubespray/issues/8028

Signed-off-by: Iago Santos <iago.santos.pardo@adfinis.com>
This commit is contained in:
Iago Santos
2021-11-19 16:58:51 +01:00
committed by GitHub
parent 2b7247f842
commit f4dae74117
25 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/download/defaults/main.yml
View File

@@ -1111,7 +1111,7 @@ downloads:
- k8s_cluster
install_socat:
enabled: "{{ ansible_os_family in ['Flatcar Container Linux by Kinvolk'] }}"
enabled: "{{ ansible_os_family in ['Flatcar', 'Flatcar Container Linux by Kinvolk'] }}"
container: true
repo: "{{ install_socat_image_repo }}"
tag: "{{ install_socat_image_tag }}"

2
roles/download/tasks/prep_download.yml
View File

@@ -99,7 +99,7 @@
mode: 0755
owner: "{{ ansible_ssh_user | default(ansible_user_id) }}"
when:
- ansible_os_family not in ["Flatcar Container Linux by Kinvolk"]
- ansible_os_family not in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
- name: prep_download | Create local cache for files and images on control node
file: