Merge branch 'main' of https://git.mrwho.ru/mrwho/ansible-bootstrap-rocky9

roles/rocky9/tasks/install-epel-repo.yml

@@ -11,4 +11,8 @@
       - unrar
       - htop
       - btop
+      - atop
+      - iftop
+      - nethogs
+      - nload
     state: present

roles/rocky9/tasks/install_packages.yml

@@ -26,7 +26,7 @@
     option: max_parallel_downloads
     value: "10"
     state: present
-    backup: yes
+    backup: true
 
 - name: Ensure the crb repository is enabled
   community.general.dnf_config_manager:
@@ -36,7 +36,7 @@
 - name: Install EPEL repo
   ansible.builtin.include_tasks: install-epel-repo.yml
 
-#- name: Upgrade all packages
+# - name: Upgrade all packages
 #  ansible.builtin.dnf:
 #    name: "*"
 #    state: latest
@@ -81,6 +81,7 @@
       - open-vm-tools
       - qemu-guest-agent
       - cloud-utils-growpart
+      - iptraf-ng
 #      - speedtest-cli
 #      - deltarpm
 #      - screen
@@ -91,11 +92,11 @@
 
 - name: Обновить всё
   become: true
-  package:
+  ansible.builtin.package:
     name: "*"
     state: latest
 
 - name: Удалить старые ядра и ненужные зависимости
   become: true
-  dnf:
-    autoremove: yes
+  ansible.builtin.dnf:
+    autoremove: true

roles/rocky9/tasks/ip_bridge.yml

@@ -7,18 +7,18 @@
     value: 0
     state: present
     sysctl_file: /etc/sysctl.d/ip_bridge.conf
-  ignore_errors: true
+  when: br_netfilter_status.stat.exists
 - name: net.bridge.bridge-nf-call-iptables
   ansible.posix.sysctl:
     name: net.bridge.bridge-nf-call-iptables
     value: 0
     state: present
     sysctl_file: /etc/sysctl.d/ip_bridge.conf
-  ignore_errors: true
+  when: br_netfilter_status.stat.exists
 - name: net.bridge.bridge-nf-call-arptables
   ansible.posix.sysctl:
     name: net.bridge.bridge-nf-call-arptables
     value: 0
     state: present
     sysctl_file: /etc/sysctl.d/ip_bridge.conf
-  ignore_errors: true
+  when: br_netfilter_status.stat.exists

roles/rocky9/tasks/ip_forward.yml

@@ -43,7 +43,7 @@
     state: present
     sysctl_file: /etc/sysctl.d/ip_forward.conf
 
-#- name: net.ipv4.conf.default.send_redirects
+# - name: net.ipv4.conf.default.send_redirects
 #  ansible.posix.sysctl:
 #    name: net.ipv4.conf.default.send_redirects
 #    value: 0

roles/rocky9/tasks/sysctl_tuning.yml

@@ -11,8 +11,14 @@
 - name: IP Forwarding
   ansible.builtin.include_tasks: ip_forward.yml
 
+- name: Проверить, загружен ли модуль br_netfilter
+  ansible.builtin.stat:
+    path: /sys/module/br_netfilter
+  register: br_netfilter_status
+
 - name: IP Bridge
   ansible.builtin.include_tasks: ip_bridge.yml
+  when: br_netfilter_status.stat.exists
 
 #  - name: Deploy kernel_tune.conf
 #  ansible.builtin.template: