Browse Source
Fix logical error when checking for boostrap-os (#10867)
Also remove some clutter along the way.
pull/10888/head
Max Gautier
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
15 additions and
23 deletions
-
roles/kubespray-defaults/tasks/main.yaml
|
|
|
@ -1,30 +1,22 @@ |
|
|
|
--- |
|
|
|
- name: Configure defaults |
|
|
|
debug: |
|
|
|
msg: "Check roles/kubespray-defaults/defaults/main/main.yml" |
|
|
|
- name: Set facts variables |
|
|
|
# do not run gather facts when bootstrap-os in roles |
|
|
|
when: > |
|
|
|
ansible_play_role_names | |
|
|
|
intersect(['bootstrap-os', 'kubernetes-sigs.kubespray.bootstrap-os']) | |
|
|
|
length == 0 |
|
|
|
tags: |
|
|
|
- always |
|
|
|
block: |
|
|
|
- name: Set fallback_ips |
|
|
|
import_tasks: fallback_ips.yml |
|
|
|
when: fallback_ips is not defined |
|
|
|
|
|
|
|
# do not run gather facts when bootstrap-os in roles |
|
|
|
- name: Set fallback_ips |
|
|
|
import_tasks: fallback_ips.yml |
|
|
|
when: |
|
|
|
- "'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 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: |
|
|
|
- always |
|
|
|
- name: Set no_proxy |
|
|
|
import_tasks: no_proxy.yml |
|
|
|
when: |
|
|
|
- http_proxy is defined or https_proxy is defined |
|
|
|
- no_proxy is not defined |
|
|
|
|
|
|
|
# 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 |
|
|
|
|
