From 9d117e9fb83e73cb410a944b0d179c8909fad353 Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Fri, 3 Oct 2025 10:35:17 +0200 Subject: [PATCH] feat: move stuff around for testing --- {roles/zabbix_agent/defaults => defaults}/main.yaml | 0 .../files => files}/zabbix/plugins.d/nvidia.conf | 0 {roles/zabbix_agent/handlers => handlers}/main.yaml | 0 {roles/zabbix_agent/meta => meta}/main.yaml | 0 playbook.yaml | 7 ++++++- {roles/zabbix_agent/tasks => tasks}/config.yaml | 0 {roles/zabbix_agent/tasks => tasks}/install.yaml | 0 {roles/zabbix_agent/tasks => tasks}/main.yaml | 0 .../templates => templates}/sudoers.d/zabbix.j2 | 0 .../templates => templates}/zabbix/zabbix_agent.conf.j2 | 0 .../templates => templates}/zabbix/zabbix_agent.psk.j2 | 0 11 files changed, 6 insertions(+), 1 deletion(-) rename {roles/zabbix_agent/defaults => defaults}/main.yaml (100%) rename {roles/zabbix_agent/files => files}/zabbix/plugins.d/nvidia.conf (100%) rename {roles/zabbix_agent/handlers => handlers}/main.yaml (100%) rename {roles/zabbix_agent/meta => meta}/main.yaml (100%) rename {roles/zabbix_agent/tasks => tasks}/config.yaml (100%) rename {roles/zabbix_agent/tasks => tasks}/install.yaml (100%) rename {roles/zabbix_agent/tasks => tasks}/main.yaml (100%) rename {roles/zabbix_agent/templates => templates}/sudoers.d/zabbix.j2 (100%) rename {roles/zabbix_agent/templates => templates}/zabbix/zabbix_agent.conf.j2 (100%) rename {roles/zabbix_agent/templates => templates}/zabbix/zabbix_agent.psk.j2 (100%) diff --git a/roles/zabbix_agent/defaults/main.yaml b/defaults/main.yaml similarity index 100% rename from roles/zabbix_agent/defaults/main.yaml rename to defaults/main.yaml diff --git a/roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf b/files/zabbix/plugins.d/nvidia.conf similarity index 100% rename from roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf rename to files/zabbix/plugins.d/nvidia.conf diff --git a/roles/zabbix_agent/handlers/main.yaml b/handlers/main.yaml similarity index 100% rename from roles/zabbix_agent/handlers/main.yaml rename to handlers/main.yaml diff --git a/roles/zabbix_agent/meta/main.yaml b/meta/main.yaml similarity index 100% rename from roles/zabbix_agent/meta/main.yaml rename to meta/main.yaml diff --git a/playbook.yaml b/playbook.yaml index e81428d..7766f90 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -4,6 +4,11 @@ - name: "install and configure the Zabbix Agent" hosts: "all" become: true + + # execute dependancy playbook roles: - role: "zabbix_prereq" - - role: "zabbix_agent" + + # execute this playbook + tasks: + - import_tasks: "tasks/main.yaml" diff --git a/roles/zabbix_agent/tasks/config.yaml b/tasks/config.yaml similarity index 100% rename from roles/zabbix_agent/tasks/config.yaml rename to tasks/config.yaml diff --git a/roles/zabbix_agent/tasks/install.yaml b/tasks/install.yaml similarity index 100% rename from roles/zabbix_agent/tasks/install.yaml rename to tasks/install.yaml diff --git a/roles/zabbix_agent/tasks/main.yaml b/tasks/main.yaml similarity index 100% rename from roles/zabbix_agent/tasks/main.yaml rename to tasks/main.yaml diff --git a/roles/zabbix_agent/templates/sudoers.d/zabbix.j2 b/templates/sudoers.d/zabbix.j2 similarity index 100% rename from roles/zabbix_agent/templates/sudoers.d/zabbix.j2 rename to templates/sudoers.d/zabbix.j2 diff --git a/roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2 b/templates/zabbix/zabbix_agent.conf.j2 similarity index 100% rename from roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2 rename to templates/zabbix/zabbix_agent.conf.j2 diff --git a/roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2 b/templates/zabbix/zabbix_agent.psk.j2 similarity index 100% rename from roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2 rename to templates/zabbix/zabbix_agent.psk.j2