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