Fix Docker include dir

ansible-collections · Jul 19, 2024 · 5166a73 · 5166a73
1 parent e2b77d6
commit 5166a73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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_dir }}
+  - /etc/zabbix/zabbix_agentd.d:{{ zabbix_agent_docker_include_dir }}
   - /:/hostfs:ro
   - /etc:/hostfs/etc:ro
   - /proc:/hostfs/proc:ro

diff --git a/roles/zabbix_agent/tasks/Docker.yml b/roles/zabbix_agent/tasks/Docker.yml
@@ -1,6 +1,7 @@
 ---
 - name: "Create volume mount string"
   ansible.builtin.set_fact:
+    zabbix_agent_docker_include_dir: "{{ (zabbix_agent_include_dir is iterable) | ternary(zabbix_agent_include_dir[0], zabbix_agent_include_dir) }}"
     volume_mount: "{{ zabbix_agent_tlspskfile }}:/var/lib/zabbix/enc/tlspskfile"
     tls_key:
       ZBX_TLSPSKFILE: tlspskfile