From 93951f2ed5387fe53a6dafb21b4ac6864c8ce2bc Mon Sep 17 00:00:00 2001
From: Hans Feldt <2808287+hafe@users.noreply.github.com>
Date: Thu, 25 Jun 2020 12:00:37 +0200
Subject: [PATCH] fix use of ansible tags (#6316)
tags are not inherited for include_role therefore the change
from include to import
Co-authored-by: Hans Feldt <hafe@users.noreply.github.com>
---
cluster.yml | 2 ++
roles/kubespray-defaults/tasks/fallback_ips.yml | 1 +
roles/kubespray-defaults/tasks/main.yaml | 4 ++--
scale.yml | 2 ++
upgrade-cluster.yml | 2 ++
5 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cluster.yml b/cluster.yml
index bf93e1bb9..b7476d47d 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -4,6 +4,7 @@
- hosts: all
gather_facts: false
+ tags: always
tasks:
- name: "Set up proxy environment"
set_fact:
@@ -31,6 +32,7 @@
- { role: bootstrap-os, tags: bootstrap-os}
- name: Gather facts
+ tags: always
import_playbook: facts.yml
- hosts: k8s-cluster:etcd
diff --git a/roles/kubespray-defaults/tasks/fallback_ips.yml b/roles/kubespray-defaults/tasks/fallback_ips.yml
index 546ac1e2b..930885a6a 100644
--- a/roles/kubespray-defaults/tasks/fallback_ips.yml
+++ b/roles/kubespray-defaults/tasks/fallback_ips.yml
@@ -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'] }}"
diff --git a/roles/kubespray-defaults/tasks/main.yaml b/roles/kubespray-defaults/tasks/main.yaml
index b27cafc15..fe268e953 100644
--- a/roles/kubespray-defaults/tasks/main.yaml
+++ b/roles/kubespray-defaults/tasks/main.yaml
@@ -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
diff --git a/scale.yml b/scale.yml
index b735a7413..b4f3dd058 100644
--- a/scale.yml
+++ b/scale.yml
@@ -4,6 +4,7 @@
- hosts: all
gather_facts: false
+ tags: always
tasks:
- name: "Set up proxy environment"
set_fact:
@@ -32,6 +33,7 @@
- { role: bootstrap-os, tags: bootstrap-os}
- name: Gather facts
+ tags: always
import_playbook: facts.yml
- name: Generate the etcd certificates beforehand
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index d5108f202..403d210af 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -4,6 +4,7 @@
- hosts: all
gather_facts: false
+ tags: always
tasks:
- name: "Set up proxy environment"
set_fact:
@@ -35,6 +36,7 @@
- { role: bootstrap-os, tags: bootstrap-os}
- name: Gather facts
+ tags: always
import_playbook: facts.yml
- name: Download images to ansible host cache via first kube-master node
--
GitLab