Zabbix: role/OS vars won't work in other roles, use a hostvar instead

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>

inventory/group_vars/all

@@ -333,6 +333,7 @@ zabbix_httpapi_use_ssl: true
 zabbix_httpapi_validate_certs: false
 zabbix_url_path: ""  # If Zabbix WebUI runs on non-default (zabbix) path ,e.g. http://<FQDN>/zabbixeu
 # Zabbix agent vars
+zabbix_agentd: /etc/zabbix_agentd.conf # Needed for zabbix_sender in other roles
 zabbix_host: "zabbix01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
 zabbix_tls_psk_identity: "Fedora"
 zabbix_tls_psk: "{{ zabbix_tls_prod_psk }}" # in ansible-private repo

roles/zabbix/zabbix_agent/defaults/main.yml

@@ -1,6 +1,7 @@
 ---
 # Defaults variables for role zabbix-agent
 zabbix_host: "zabbix.server"
+zabbix_agentd: /etc/zabbix/zabbix_agentd.conf
 zabbix_agent_hostname: "{{ ansible_hostname }}"
 zabbix_base_templates:
 - Linux by Zabbix agent active

roles/zabbix/zabbix_agent/vars/CentOS-7.yml

@@ -7,6 +7,4 @@ zabbix_pkgs_list:
   - zabbix7.0
   - bc
 
-zabbix_agentd: /etc/zabbix_agentd.conf
-
 zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/CentOS-8.yml

@@ -7,6 +7,4 @@ zabbix_pkgs_list:
   - zabbix7.0
   - bc
 
-zabbix_agentd: /etc/zabbix_agentd.conf
-
 zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/CentOS-9.yml

@@ -7,6 +7,4 @@ zabbix_pkgs_list:
   - zabbix7.0
   - bc
 
-zabbix_agentd: /etc/zabbix_agentd.conf
-
 zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/Fedora.yml

@@ -9,6 +9,4 @@ zabbix_pkgs_list:
   - bc
   - ncurses-compat-libs  # Needed for some megacli tools and raid monitoring checks through zabbix_sender
 
-zabbix_agentd: /etc/zabbix_agentd.conf
-
 zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/common.yml

@@ -7,5 +7,3 @@ zabbix_pkgs_list:
   - zabbix-agent
   - zabbix-sender
   - bc
-
-zabbix_agentd: /etc/zabbix/zabbix_agentd.conf