Upstream/k3s-ansible
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s-ansible.git synced 2024-06-27 10:44:43 +02:00
Code Issues Projects Releases Wiki Activity

Update pre_req tasks (#128)

Browse Source 
On Rhel 8.4 ansible_distribution is set to RedHat so the current when condition will fail
Added "RedHat" to the when condition.

Signed-off-by: Razurac <a.zelch@t-online.de>
This commit is contained in:
Razurac 2023-11-07 18:54:32 +01:00 committed by GitHub
parent b1c8c063f7
commit 8474a8b4e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/prereq/tasks/main.yml
View File

@ -2,7 +2,7 @@
- name: Set SELinux to disabled state - name: Set SELinux to disabled state
selinux: selinux:
state: disabled state: disabled
when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux'] when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']
- name: Enable IPv4 forwarding - name: Enable IPv4 forwarding
sysctl: sysctl:
@ -24,13 +24,13 @@
content: "br_netfilter" content: "br_netfilter"
dest: /etc/modules-load.d/br_netfilter.conf dest: /etc/modules-load.d/br_netfilter.conf
mode: "u=rw,g=,o=" mode: "u=rw,g=,o="
when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux'] when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']
- name: Load br_netfilter - name: Load br_netfilter
modprobe: modprobe:
name: br_netfilter name: br_netfilter
state: present state: present
when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux'] when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']
- name: Set bridge-nf-call-iptables (just to be sure) - name: Set bridge-nf-call-iptables (just to be sure)
sysctl: sysctl:
@ -38,7 +38,7 @@
value: "1" value: "1"
state: present state: present
reload: yes reload: yes
when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux'] when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']
loop: loop:
- net.bridge.bridge-nf-call-iptables - net.bridge.bridge-nf-call-iptables
- net.bridge.bridge-nf-call-ip6tables - net.bridge.bridge-nf-call-ip6tables
@ -51,4 +51,4 @@
insertafter: EOF insertafter: EOF
path: /etc/sudoers path: /etc/sudoers
validate: 'visudo -cf %s' validate: 'visudo -cf %s'
when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux'] when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']