From 439607d573a8e2e8b5a320a24a02851245acda7c Mon Sep 17 00:00:00 2001 From: ERIK Date: Tue, 21 Mar 2023 16:35:09 +0800 Subject: [PATCH] fix allow unsupported distribution (#9904) Signed-off-by: bo.jiang --- inventory/sample/group_vars/all/all.yml | 3 +++ roles/container-engine/containerd/defaults/main.yml | 3 --- roles/kubernetes/preinstall/tasks/0020-verify-settings.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index d8a13dead5f..223b7c70bab 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -133,3 +133,6 @@ ntp_servers: ## Used to control no_log attribute unsafe_show_logs: false + +## If enabled it will allow kubespray to attempt setup even if the distribution is not supported. For unsupported distributions this can lead to unexpected failures in some cases. +allow_unsupported_distribution_setup: false diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 44ff8409b47..e763d91b106 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -97,6 +97,3 @@ containerd_supported_distributions: - "UnionTech" - "UniontechOS" - "openEuler" - -# If enabled it will allow kubespray to attempt setup even if the distribution is not supported. For unsupported distributions this can lead to unexpected failures in some cases. -allow_unsupported_distribution_setup: false diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml index ec425a5a063..514f3215d9e 100644 --- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml @@ -24,7 +24,7 @@ - name: Stop if the os does not support assert: - that: ansible_distribution in supported_os_distributions + that: (allow_unsupported_distribution_setup | default(false)) or ansible_distribution in supported_os_distributions msg: "{{ ansible_distribution }} is not a known OS" when: not ignore_assert_errors