External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-31 06:26:19 -02:30
Code Issues Packages Projects Releases Wiki Activity

Replace injected Ansible fact variables in network_plugin role (#13382)

Browse Source
This commit is contained in:
Nikhil Kumar
2026-08-16 14:24:17 +00:00
committed by GitHub
parent ddd9ae131b
commit bf077e7360
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/network_plugin/calico/tasks/pre.yml
+6 -6
View File
@@ -24,12 +24,12 @@
include_vars: "{{ item }}"
with_first_found:
- files:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower | replace('/', '_') }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_release }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower | replace('/', '_') }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_architecture }}.yml"
- "{{ ansible_os_family | lower }}.yml"
- "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower | replace('/', '_') }}.yml"
- "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_release'] }}.yml"
- "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower | replace('/', '_') }}.yml"
- "{{ ansible_facts['distribution'] | lower }}.yml"
- "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['architecture'] }}.yml"
- "{{ ansible_facts['os_family'] | lower }}.yml"
- defaults.yml
paths:
- ../vars
roles/network_plugin/calico/tasks/repos.yml
+2 -2
View File
@@ -16,6 +16,6 @@
enabled: true
repo_gpgcheck: false
when:
- ansible_os_family in ['RedHat']
- ansible_distribution not in ['Fedora']
- ansible_facts['os_family'] in ['RedHat']
- ansible_facts['distribution'] not in ['Fedora']
- ansible_facts['distribution_major_version'] | int < 9