Fixing zabbix agent include issues

ansible-collections · Jul 5, 2024 · ffb2de6 · ffb2de6
1 parent a7602ee
commit ffb2de6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/changelogs/fragments/1322.yml b/changelogs/fragments/1322.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - zabbix_agent Role - Fixed several issues related to `zabbix_agent_include_dir` and `zabbix_agent_include`
diff --git a/roles/zabbix_agent/defaults/main.yml b/roles/zabbix_agent/defaults/main.yml
@@ -136,7 +136,7 @@ zabbix_agent_docker_ports:
 zabbix_agent_docker_security_opts:
   - apparmor:unconfined
 zabbix_agent_docker_volumes:
-  - /etc/zabbix/zabbix_agentd.d:{{ zabbix_agent_include }}
+  - /etc/zabbix/zabbix_agentd.d:{{ zabbix_agent_include_dir }}
   - /:/hostfs:ro
   - /etc:/hostfs/etc:ro
   - /proc:/hostfs/proc:ro

diff --git a/roles/zabbix_agent/tasks/remove.yml b/roles/zabbix_agent/tasks/remove.yml
@@ -20,6 +20,6 @@
 
 - name: "Remove | Remove the agent-include-dir"
   ansible.builtin.file:
-    path: "{{ zabbix_agent_include | replace('agent2', 'agent') }}"
+    path: "{{ zabbix_agent_include_dir | replace('agent2', 'agent') }}"
     state: absent
   become: true
diff --git a/roles/zabbix_agent/tasks/userparameter.yml b/roles/zabbix_agent/tasks/userparameter.yml
@@ -29,7 +29,7 @@
         - name: Install user-defined userparameters
           ansible.builtin.template:
             src: "{{ zabbix_agent_userparameters_templates_src }}/{{ item.name }}.j2"
-            dest: "{{ zabbix_agent_include }}/userparameter_{{ item.name }}.conf"
+            dest: "{{ zabbix_agent_include_dir }}/userparameter_{{ item.name }}.conf"
             owner: zabbix
             group: zabbix
             mode: "0644"