From 71a6827ca9817fac5b221272329b045950cffb7b Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Wed, 16 Apr 2025 18:21:41 +0200 Subject: [PATCH] feat: collect version information once --- tasks/install.yaml | 9 --------- tasks/main.yaml | 23 ++++++++++++++++------- tasks/prerequisites.yaml | 9 --------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/tasks/install.yaml b/tasks/install.yaml index ffcf3ba..92aaa1f 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -1,14 +1,5 @@ --- -# find current zabbix version -- name: "check for old zabbix-release" - ansible.builtin.shell: - cmd: "zabbix_agent2 --version | head -n 1" - changed_when: false - failed_when: false - ignore_errors: true - register: "zabbix_current_version" - # install zabbix-agent2 - name: "install zabbix-agent2" when: "zabbix_major_version not in zabbix_current_version.stdout" diff --git a/tasks/main.yaml b/tasks/main.yaml index 6ca7c0d..890cb72 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -1,20 +1,31 @@ --- -# load variables -- name: "include os specific vars" - ansible.builtin.include_vars: "{{ ansible_os_family }}.yaml" +# load variables and collect version information +- name: "include vars and collect versions" tags: - - "zabbix_agent" - "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: + cmd: "zabbix_agent2 --version | head -n 1" + changed_when: false + failed_when: false + ignore_errors: true + register: "zabbix_current_version" # zabbix-agent prerequisites - name: "zabbix-agent prerequisites" ansible.builtin.import_tasks: "prerequisites.yaml" tags: - - "zabbix_agent" - "zabbix_agent_prereq" @@ -22,7 +33,6 @@ - name: "zabbix-agent install" ansible.builtin.import_tasks: "install.yaml" tags: - - "zabbix_agent" - "zabbix_agent_install" @@ -30,5 +40,4 @@ - name: "zabbix-agent config" ansible.builtin.import_tasks: "config.yaml" tags: - - "zabbix_agent" - "zabbix_agent_config" diff --git a/tasks/prerequisites.yaml b/tasks/prerequisites.yaml index 11e7ba3..1ce8a1e 100644 --- a/tasks/prerequisites.yaml +++ b/tasks/prerequisites.yaml @@ -1,14 +1,5 @@ --- -# find current zabbix version -- name: "check for old zabbix-release" - ansible.builtin.shell: - cmd: "zabbix_agent2 --version | head -n 1" - changed_when: false - failed_when: false - ignore_errors: true - register: "zabbix_current_version" - # install repository - name: "install repository" when: "zabbix_major_version not in zabbix_current_version.stdout"