From c2e3071a33b3559e1fc7df289069ff1d24d52b4c Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 28 Nov 2023 09:23:46 +0100
Subject: [PATCH] kubespray-defaults: Check for boostrap-os FQDN (#10590)
When installed as an ansible collection, roles in
ansible_play_role_names will be designated by their FQDN (i.e
'kubernetes-sigs.kubespray.<role-name>).
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 ebd9b896b..650408726 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:
--
GitLab