mirror of
https://github.com/geerlingguy/ansible-role-kubernetes.git
synced 2025-11-30 20:04:26 +01:00
Attempt to fix ansible_facts deprecation warnings.
This commit is contained in:
parent
d8a19c39ce
commit
d61baa9cd6
@ -19,15 +19,15 @@
|
||||
pre_tasks:
|
||||
- name: Update apt cache.
|
||||
apt: update_cache=true cache_valid_time=600
|
||||
when: ansible_os_family == 'Debian'
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
||||
- name: Ensure test dependencies are installed (RedHat).
|
||||
package: name=iproute state=present
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when: ansible_facts.os_family == 'RedHat'
|
||||
|
||||
- name: Ensure test dependencies are installed (Debian).
|
||||
package: name=iproute2 state=present
|
||||
when: ansible_os_family == 'Debian'
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
||||
- name: Gather facts.
|
||||
action: setup
|
||||
|
||||
@ -15,15 +15,15 @@
|
||||
pre_tasks:
|
||||
- name: Update apt cache.
|
||||
apt: update_cache=true cache_valid_time=600
|
||||
when: ansible_os_family == 'Debian'
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
||||
- name: Ensure test dependencies are installed (RedHat).
|
||||
package: name=iproute state=present
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when: ansible_facts.os_family == 'RedHat'
|
||||
|
||||
- name: Ensure test dependencies are installed (Debian).
|
||||
package: name=iproute2 state=present
|
||||
when: ansible_os_family == 'Debian'
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
||||
- name: Gather facts.
|
||||
action: setup
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
---
|
||||
- name: Include OS-specific variables.
|
||||
include_vars: "{{ ansible_os_family }}.yml"
|
||||
include_vars: "{{ ansible_facts.os_family }}.yml"
|
||||
|
||||
- include_tasks: setup-RedHat.yml
|
||||
when: ansible_os_family == 'RedHat'
|
||||
when: ansible_facts.os_family == 'RedHat'
|
||||
|
||||
- include_tasks: setup-Debian.yml
|
||||
when: ansible_os_family == 'Debian'
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
||||
- name: Install Kubernetes packages.
|
||||
package:
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
name: "{{ procps_package }}"
|
||||
state: present
|
||||
when: >
|
||||
ansible_distribution != 'Debian'
|
||||
or ansible_distribution_major_version | int < 10
|
||||
ansible_facts.distribution != 'Debian'
|
||||
or ansible_facts.distribution_major_version | int < 10
|
||||
|
||||
- name: Ensure module br_netfilter is loaded
|
||||
modprobe:
|
||||
@ -24,6 +24,6 @@
|
||||
- net.bridge.bridge-nf-call-iptables
|
||||
- net.bridge.bridge-nf-call-ip6tables
|
||||
when: >
|
||||
( ansible_distribution != 'Debian'
|
||||
or ansible_distribution_major_version | int < 10
|
||||
( ansible_facts.distribution != 'Debian'
|
||||
or ansible_facts.distribution_major_version | int < 10
|
||||
) and not ansible_virtualization_type == "docker"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user