Skip to content
Snippets Groups Projects
Unverified Commit c2e3071a authored by Max Gautier's avatar Max Gautier Committed by GitHub
Browse files

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.
parent 21e8b96e
No related branches found
No related tags found
No related merge requests found
...@@ -9,15 +9,18 @@ ...@@ -9,15 +9,18 @@
- name: Set fallback_ips - name: Set fallback_ips
import_tasks: fallback_ips.yml import_tasks: fallback_ips.yml
when: 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 - fallback_ips is not defined
tags: tags:
- always - always
- name: Set no_proxy - name: Set no_proxy
import_tasks: no_proxy.yml import_tasks: no_proxy.yml
when: 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 - http_proxy is defined or https_proxy is defined
- no_proxy is not defined - no_proxy is not defined
tags: tags:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment