External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-17 03:00:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix use of ansible tags (#6316)

Browse Source 
tags are not inherited for include_role therefore the change
from include to import

Co-authored-by: Hans Feldt <hafe@users.noreply.github.com>
This commit is contained in:
Hans Feldt
2020-06-25 12:00:37 +02:00
committed by GitHub
parent c29b21717d
commit 93951f2ed5
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubespray-defaults/tasks/fallback_ips.yml
View File

@@ -4,6 +4,7 @@
# Thanks https://medium.com/opsops/ansible-default-ipv4-is-not-what-you-think-edb8ab154b10
- name: Gather ansible_default_ipv4 from all hosts
tags: always
include_tasks: fallback_ips_gather.yml
when: hostvars[delegate_host_to_gather_facts].ansible_default_ipv4 is not defined
loop: "{{ groups['all'] }}"

4
roles/kubespray-defaults/tasks/main.yaml
View File

@@ -7,7 +7,7 @@
# do not run gather facts when bootstrap-os in roles
- name: set fallback_ips
include_tasks: fallback_ips.yml
import_tasks: fallback_ips.yml
when:
- "'bootstrap-os' not in ansible_play_role_names"
- fallback_ips is not defined
@@ -15,7 +15,7 @@
- always
- name: set no_proxy
include_tasks: no_proxy.yml
import_tasks: no_proxy.yml
when:
- "'bootstrap-os' not in ansible_play_role_names"
- http_proxy is defined or https_proxy is defined