From 75226a9c78fccf5f4376b326cd2b252769e1c2c1 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Fri, 6 Jun 2025 17:10:18 +0200
Subject: [PATCH] feat: move prereq to dedicated role

---
 meta/main.yaml           |  4 +++-
 tasks/main.yaml          | 12 ----------
 tasks/prerequisites.yaml | 52 ----------------------------------------
 vars/Debian.yaml         | 15 ------------
 vars/Suse.yaml           |  7 ------
 5 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 tasks/prerequisites.yaml
 delete mode 100644 vars/Debian.yaml
 delete mode 100644 vars/Suse.yaml

diff --git a/meta/main.yaml b/meta/main.yaml
index fc18f4c..53ca5e0 100644
--- a/meta/main.yaml
+++ b/meta/main.yaml
@@ -5,4 +5,6 @@ galaxy_info:
   description: "install and configure a Zabbix Agent"
   license: "MIT"
   role_name: "zabbix_agent"
-dependencies: []
+dependencies:
+  - name: "zabbix_prereq"
+    src: "https://gitlab.simoncor.net/ansible/ans-zabbix-agent.git"
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 890cb72..f59b431 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -3,15 +3,10 @@
 # load variables and collect version information
 - name: "include vars and collect versions"
   tags:
-    - "zabbix_agent_prereq"
     - "zabbix_agent_install"
     - "zabbix_agent_config"
   block:
 
-    # load os specific variables
-    - name: "include os specific vars"
-      ansible.builtin.include_vars: "{{ ansible_os_family }}.yaml"
-
     # collect zabbix-agent2 version information
     - name: "collect version information"
       ansible.builtin.shell:
@@ -22,13 +17,6 @@
       register: "zabbix_current_version"
 
 
-# zabbix-agent prerequisites
-- name: "zabbix-agent prerequisites"
-  ansible.builtin.import_tasks: "prerequisites.yaml"
-  tags:
-    - "zabbix_agent_prereq"
-
-
 # zabbix-agent install
 - name: "zabbix-agent install"
   ansible.builtin.import_tasks: "install.yaml"
diff --git a/tasks/prerequisites.yaml b/tasks/prerequisites.yaml
deleted file mode 100644
index 00f4cfa..0000000
--- a/tasks/prerequisites.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-
-# install repository
-- name: "install repository"
-  when: "zabbix_major_version not in zabbix_current_version.stdout"
-  block:
-
-    # install repository - debian
-    - name: "install repository"
-      when: 'ansible_os_family == "Debian"'
-      block:
-
-        - name: "remove old zabbix-release"
-          ansible.builtin.apt:
-            name: "zabbix-release"
-            state: "absent"
-            purge: true
-
-        - name: "install zabbix-release"
-          ansible.builtin.apt:
-            deb: "{{ zabbix_repo_url[ansible_distribution][ansible_distribution_major_version | int] }}"
-            state: "present"
-            force: true
-
-        - name: "refresh apt cache"
-          ansible.builtin.apt:
-            update_cache: true
-
-
-    # install repository - suse
-    - name: "install repository"
-      when: 'ansible_os_family == "Suse"'
-      block:
-
-        - name: "remove old zabbix-release"
-          ansible.builtin.zypper:
-            name: "zabbix-release"
-            state: "absent"
-
-        - name: "install zabbix-release"
-          ansible.builtin.zypper:
-            name: "{{ zabbix_repo_url[ansible_distribution_major_version | int] }}"
-            state: "present"
-            disable_recommends: false
-            nosignature: true
-            validate_certs: true
-
-        - name: "import gpg key"
-          community.general.zypper_repository:
-            name: "Zabbix Official Repository"
-            auto_import_keys: true
-            runrefresh: true
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
deleted file mode 100644
index 13c7e9d..0000000
--- a/vars/Debian.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-
-# zabbix repository url
-zabbix_repo_url:
-  Debian:
-    12:
-      "https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/release/debian/pool/main/z/zabbix-release/\
-       zabbix-release_latest_{{ zabbix_major_version }}+debian12_all.deb"
-  Ubuntu:
-    24:
-      "https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/release/ubuntu/pool/main/z/zabbix-release/\
-       zabbix-release_latest_{{ zabbix_major_version }}+ubuntu24.04_all.deb"
-    22:
-      "https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/release/ubuntu/pool/main/z/zabbix-release/\
-       zabbix-release_latest_{{ zabbix_major_version }}+ubuntu22.04_all.deb"
diff --git a/vars/Suse.yaml b/vars/Suse.yaml
deleted file mode 100644
index 0381f54..0000000
--- a/vars/Suse.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-# zabbix repository url
-zabbix_repo_url:
-  15:
-    "https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/release/sles/\
-     15/noarch/zabbix-release-latest-{{ zabbix_major_version }}.sles15.noarch.rpm"