From 0936c97025eb56bb20fcc3278eb27b58d1bb02b8 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 4 Oct 2024 17:16:51 +0200
Subject: [PATCH] refs #8025 PVE fixes

---
 roles/pve/handlers/main.yml |  4 ++++
 roles/pve/tasks/main.yml    | 35 ++++-------------------------------
 roles/pve/tasks/nrpe.yml    | 24 ++++++++++++++++++++++++
 roles/pve/tasks/vhost.yml   |  8 ++++++++
 4 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 roles/pve/tasks/nrpe.yml
 create mode 100644 roles/pve/tasks/vhost.yml

diff --git a/roles/pve/handlers/main.yml b/roles/pve/handlers/main.yml
index 0399734..c096c8e 100644
--- a/roles/pve/handlers/main.yml
+++ b/roles/pve/handlers/main.yml
@@ -2,3 +2,7 @@
   service:
     name: nagios-nrpe-server
     state: restarted
+- name: restart-sysctl
+  service:
+    name: systemd-sysctl
+    state: restarted
diff --git a/roles/pve/tasks/main.yml b/roles/pve/tasks/main.yml
index 67fbc3a..af048f9 100644
--- a/roles/pve/tasks/main.yml
+++ b/roles/pve/tasks/main.yml
@@ -1,31 +1,4 @@
-- name: Set NRPE PVE configuration
-  copy:
-    src: nrpe.cfg
-    dest: /etc/nagios/nrpe.d/95-pve.cfg
-    owner: root
-    group: root
-    mode: u=rw,g=r,o=r
-  notify: restart-nrpe
-- name: Copy PVE NRPE plugins
-  copy:
-    src: nrpe/
-    dest: /etc/nagios/plugins/
-    owner: root
-    group: root
-    mode: u=rwx,g=rx,o=rx
-  notify: restart-nrpe
-- name: Add nagios to sudoers
-  copy:
-    src: sudoers
-    dest: /etc/sudoers.d/nagios
-    mode: u=rw,g=r,o=
-    owner: root
-    group: root
-  notify: restart-nrpe
-- name: Configure memory regions
-  copy:
-    src: vhost.conf
-    dest: /etc/modprobe.d/
-    mode: u=rw,g=r,o=r
-    owner: root
-    group: root
+- import_tasks: nrpe.yml
+  tags: nrpe
+- import_tasks: vhost.yml
+  tags: vhost
diff --git a/roles/pve/tasks/nrpe.yml b/roles/pve/tasks/nrpe.yml
new file mode 100644
index 0000000..e280c13
--- /dev/null
+++ b/roles/pve/tasks/nrpe.yml
@@ -0,0 +1,24 @@
+- name: Set NRPE PVE configuration
+  copy:
+    src: nrpe.cfg
+    dest: /etc/nagios/nrpe.d/95-pve.cfg
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+  notify: restart-nrpe
+- name: Copy PVE NRPE plugins
+  copy:
+    src: nrpe/
+    dest: /etc/nagios/plugins/
+    owner: root
+    group: root
+    mode: u=rwx,g=rx,o=rx
+  notify: restart-nrpe
+- name: Add nagios to sudoers
+  copy:
+    src: sudoers
+    dest: /etc/sudoers.d/nagios
+    mode: u=rw,g=r,o=
+    owner: root
+    group: root
+  notify: restart-nrpe
diff --git a/roles/pve/tasks/vhost.yml b/roles/pve/tasks/vhost.yml
new file mode 100644
index 0000000..81bc001
--- /dev/null
+++ b/roles/pve/tasks/vhost.yml
@@ -0,0 +1,8 @@
+- name: Configure memory regions
+  copy:
+    src: vhost.conf
+    dest: /etc/modprobe.d/
+    mode: u=rw,g=r,o=r
+    owner: root
+    group: root
+  notify: restart-sysctl