Mirrors/geerlingguy.ansible-role-kubernetes
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-kubernetes.git synced 2025-11-30 20:04:26 +01:00
Code Issues Projects Releases Wiki Activity

Attempt to fix ansible_facts deprecation warnings.

Browse Source
This commit is contained in:
Jeff Geerling 2025-11-27 22:12:14 -06:00
parent d8a19c39ce
commit d61baa9cd6
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
molecule/default/calico.yml
View File

@ -19,15 +19,15 @@
pre_tasks: pre_tasks:
- name: Update apt cache. - name: Update apt cache.
apt: update_cache=true cache_valid_time=600 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). - name: Ensure test dependencies are installed (RedHat).
package: name=iproute state=present package: name=iproute state=present
when: ansible_os_family == 'RedHat' when: ansible_facts.os_family == 'RedHat'
- name: Ensure test dependencies are installed (Debian). - name: Ensure test dependencies are installed (Debian).
package: name=iproute2 state=present package: name=iproute2 state=present
when: ansible_os_family == 'Debian' when: ansible_facts.os_family == 'Debian'
- name: Gather facts. - name: Gather facts.
action: setup action: setup

6
molecule/default/converge.yml
View File

@ -15,15 +15,15 @@
pre_tasks: pre_tasks:
- name: Update apt cache. - name: Update apt cache.
apt: update_cache=true cache_valid_time=600 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). - name: Ensure test dependencies are installed (RedHat).
package: name=iproute state=present package: name=iproute state=present
when: ansible_os_family == 'RedHat' when: ansible_facts.os_family == 'RedHat'
- name: Ensure test dependencies are installed (Debian). - name: Ensure test dependencies are installed (Debian).
package: name=iproute2 state=present package: name=iproute2 state=present
when: ansible_os_family == 'Debian' when: ansible_facts.os_family == 'Debian'
- name: Gather facts. - name: Gather facts.
action: setup action: setup

6
tasks/main.yml
View File

@ -1,12 +1,12 @@
--- ---
- name: Include OS-specific variables. - name: Include OS-specific variables.
include_vars: "{{ ansible_os_family }}.yml" include_vars: "{{ ansible_facts.os_family }}.yml"
- include_tasks: setup-RedHat.yml - include_tasks: setup-RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_facts.os_family == 'RedHat'
- include_tasks: setup-Debian.yml - include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian' when: ansible_facts.os_family == 'Debian'
- name: Install Kubernetes packages. - name: Install Kubernetes packages.
package: package:

8
tasks/sysctl-setup.yml
View File

@ -4,8 +4,8 @@
name: "{{ procps_package }}" name: "{{ procps_package }}"
state: present state: present
when: > when: >
ansible_distribution != 'Debian' ansible_facts.distribution != 'Debian'
or ansible_distribution_major_version | int < 10 or ansible_facts.distribution_major_version | int < 10
- name: Ensure module br_netfilter is loaded - name: Ensure module br_netfilter is loaded
modprobe: modprobe:
@ -24,6 +24,6 @@
- net.bridge.bridge-nf-call-iptables - net.bridge.bridge-nf-call-iptables
- net.bridge.bridge-nf-call-ip6tables - net.bridge.bridge-nf-call-ip6tables
when: > when: >
( ansible_distribution != 'Debian' ( ansible_facts.distribution != 'Debian'
or ansible_distribution_major_version | int < 10 or ansible_facts.distribution_major_version | int < 10
) and not ansible_virtualization_type == "docker" ) and not ansible_virtualization_type == "docker"