From c0082d4bc35a6920ef5d06df1c7c52e9b5218229 Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Fri, 3 Oct 2025 10:38:46 +0200 Subject: [PATCH] feat: move stuff around part 3 --- playbook.yaml | 8 +------- requirements.yml => roles/requirements.yml | 0 {defaults => roles/zabbix_agent/defaults}/main.yaml | 0 .../zabbix_agent/files}/zabbix/plugins.d/nvidia.conf | 0 {handlers => roles/zabbix_agent/handlers}/main.yaml | 0 {meta => roles/zabbix_agent/meta}/main.yaml | 0 {tasks => roles/zabbix_agent/tasks}/config.yaml | 0 {tasks => roles/zabbix_agent/tasks}/install.yaml | 0 {tasks => roles/zabbix_agent/tasks}/main.yaml | 0 .../zabbix_agent/templates}/sudoers.d/zabbix.j2 | 0 .../zabbix_agent/templates}/zabbix/zabbix_agent.conf.j2 | 0 .../zabbix_agent/templates}/zabbix/zabbix_agent.psk.j2 | 0 12 files changed, 1 insertion(+), 7 deletions(-) rename requirements.yml => roles/requirements.yml (100%) rename {defaults => roles/zabbix_agent/defaults}/main.yaml (100%) rename {files => roles/zabbix_agent/files}/zabbix/plugins.d/nvidia.conf (100%) rename {handlers => roles/zabbix_agent/handlers}/main.yaml (100%) rename {meta => roles/zabbix_agent/meta}/main.yaml (100%) rename {tasks => roles/zabbix_agent/tasks}/config.yaml (100%) rename {tasks => roles/zabbix_agent/tasks}/install.yaml (100%) rename {tasks => roles/zabbix_agent/tasks}/main.yaml (100%) rename {templates => roles/zabbix_agent/templates}/sudoers.d/zabbix.j2 (100%) rename {templates => roles/zabbix_agent/templates}/zabbix/zabbix_agent.conf.j2 (100%) rename {templates => roles/zabbix_agent/templates}/zabbix/zabbix_agent.psk.j2 (100%) diff --git a/playbook.yaml b/playbook.yaml index 151b544..e81428d 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -4,12 +4,6 @@ - name: "install and configure the Zabbix Agent" hosts: "all" become: true - - # execute dependancy playbook roles: - role: "zabbix_prereq" - - # execute this playbook - tasks: - - include_role: - name: "." + - role: "zabbix_agent" diff --git a/requirements.yml b/roles/requirements.yml similarity index 100% rename from requirements.yml rename to roles/requirements.yml diff --git a/defaults/main.yaml b/roles/zabbix_agent/defaults/main.yaml similarity index 100% rename from defaults/main.yaml rename to roles/zabbix_agent/defaults/main.yaml diff --git a/files/zabbix/plugins.d/nvidia.conf b/roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf similarity index 100% rename from files/zabbix/plugins.d/nvidia.conf rename to roles/zabbix_agent/files/zabbix/plugins.d/nvidia.conf diff --git a/handlers/main.yaml b/roles/zabbix_agent/handlers/main.yaml similarity index 100% rename from handlers/main.yaml rename to roles/zabbix_agent/handlers/main.yaml diff --git a/meta/main.yaml b/roles/zabbix_agent/meta/main.yaml similarity index 100% rename from meta/main.yaml rename to roles/zabbix_agent/meta/main.yaml diff --git a/tasks/config.yaml b/roles/zabbix_agent/tasks/config.yaml similarity index 100% rename from tasks/config.yaml rename to roles/zabbix_agent/tasks/config.yaml diff --git a/tasks/install.yaml b/roles/zabbix_agent/tasks/install.yaml similarity index 100% rename from tasks/install.yaml rename to roles/zabbix_agent/tasks/install.yaml diff --git a/tasks/main.yaml b/roles/zabbix_agent/tasks/main.yaml similarity index 100% rename from tasks/main.yaml rename to roles/zabbix_agent/tasks/main.yaml diff --git a/templates/sudoers.d/zabbix.j2 b/roles/zabbix_agent/templates/sudoers.d/zabbix.j2 similarity index 100% rename from templates/sudoers.d/zabbix.j2 rename to roles/zabbix_agent/templates/sudoers.d/zabbix.j2 diff --git a/templates/zabbix/zabbix_agent.conf.j2 b/roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2 similarity index 100% rename from templates/zabbix/zabbix_agent.conf.j2 rename to roles/zabbix_agent/templates/zabbix/zabbix_agent.conf.j2 diff --git a/templates/zabbix/zabbix_agent.psk.j2 b/roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2 similarity index 100% rename from templates/zabbix/zabbix_agent.psk.j2 rename to roles/zabbix_agent/templates/zabbix/zabbix_agent.psk.j2