From 5973495b809c26a93d94000d0796c61b891d1517 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Fri, 3 Nov 2023 16:36:10 +0100 Subject: [PATCH] kubespray-defaults: Check for boostrap-os FQDN When installed as an ansible collection, roles in ansible_play_role_names will be designated by their FQDN (i.e 'kubernetes-sigs.kubespray.). It means we need to check for both when checking for roles in the play. --- roles/kubespray-defaults/tasks/main.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/kubespray-defaults/tasks/main.yaml b/roles/kubespray-defaults/tasks/main.yaml index ebd9b896be0..65040872612 100644 --- a/roles/kubespray-defaults/tasks/main.yaml +++ b/roles/kubespray-defaults/tasks/main.yaml @@ -9,15 +9,18 @@ - name: Set fallback_ips import_tasks: fallback_ips.yml when: - - "'bootstrap-os' not in ansible_play_role_names" + - "'bootstrap-os' not in ansible_play_role_names or + 'kubernetes-sigs.kubespray.bootstrap-os' not in ansible_play_role_names" - fallback_ips is not defined tags: - always + - name: Set no_proxy import_tasks: no_proxy.yml when: - - "'bootstrap-os' not in ansible_play_role_names" + - "'bootstrap-os' not in ansible_play_role_names or + 'kubernetes-sigs.kubespray.bootstrap-os' not in ansible_play_role_names" - http_proxy is defined or https_proxy is defined - no_proxy is not defined tags: