Commit 75226a9c authored by Simon Cornet's avatar Simon Cornet
Browse files

feat: move prereq to dedicated role

parent 8640af02

meta/main.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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"

tasks/main.yaml

+0 −12
Original line number Diff line number Diff line
@@ -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"

tasks/prerequisites.yaml

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
---



# 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

vars/Debian.yaml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
---



# 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"

vars/Suse.yaml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
---



# 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"