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

Fix logical error when checking for boostrap-os (#10867)

Also remove some clutter along the way.
parent 200b6303
No related branches found
No related tags found
No related merge requests found
--- ---
- name: Configure defaults - name: Set facts variables
debug: # do not run gather facts when bootstrap-os in roles
msg: "Check roles/kubespray-defaults/defaults/main/main.yml" when: >
ansible_play_role_names |
intersect(['bootstrap-os', 'kubernetes-sigs.kubespray.bootstrap-os']) |
length == 0
tags: tags:
- always - always
block:
# do not run gather facts when bootstrap-os in roles
- name: Set fallback_ips - name: Set fallback_ips
import_tasks: fallback_ips.yml import_tasks: fallback_ips.yml
when: when: fallback_ips is not defined
- "'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 - name: Set no_proxy
import_tasks: no_proxy.yml import_tasks: no_proxy.yml
when: when:
- "'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:
- always
# TODO: Clean this task up when we drop backward compatibility support for `etcd_kubeadm_enabled` # TODO: Clean this task up when we drop backward compatibility support for `etcd_kubeadm_enabled`
- name: Set `etcd_deployment_type` to "kubeadm" if `etcd_kubeadm_enabled` is true - name: Set `etcd_deployment_type` to "kubeadm" if `etcd_kubeadm_enabled` is true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment