Fix #1236 - Fixes removal of wrong include directory (#1302)

ansible-collections · Jun 22, 2024 · 3f38086 · 3f38086
1 parent b0f05b4
commit 3f38086
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/changelogs/fragments/pr_1302_wrong_include_dir_removal.yml b/changelogs/fragments/pr_1302_wrong_include_dir_removal.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - Fix for removal of wrong agent include directory (https://github.com/ansible-collections/community.zabbix/issues/1236)
diff --git a/roles/zabbix_agent/tasks/remove.yml b/roles/zabbix_agent/tasks/remove.yml
@@ -4,7 +4,7 @@
 
 - name: 'Remove | Make sure the "old" zabbix-agent service stopped'
   ansible.builtin.service:
-    name: "zabbix-agent"
+    name: "{{ zabbix_agent_service | replace('agent2', 'agent') }}"
     state: stopped
     enabled: false
   become: true
@@ -14,12 +14,12 @@
 
 - name: "Remove | Package removal"
   ansible.builtin.package:
-    name: "zabbix-agent"
+    name: "{{ zabbix_agent_package | replace('agent2', 'agent') }}"
     state: absent
   become: true
 
 - name: "Remove | Remove the agent-include-dir"
   ansible.builtin.file:
-    path: "{{ zabbix_agent_include }}"
+    path: "{{ zabbix_agent_include | replace('agent2', 'agent') }}"
     state: absent
   become: true