remote: improved cleanup logic

saltyorg · Aug 28, 2023 · a0ec8c1 · a0ec8c1
1 parent 60d86c8
commit a0ec8c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/roles/remote/tasks/cleanup.yml b/roles/remote/tasks/cleanup.yml
@@ -10,6 +10,7 @@
 - name: "Cleanup | Set 'rclone_service_name'"
   ansible.builtin.set_fact:
     rclone_service_name: "{{ item.split('.')[0] }}"
+    rclone_service_name_full: "{{ item.split('.')[0] }}.service"
     rclone_refresh_service_name: "{{ item.split('.')[0] }}_refresh.service"
 
 - name: "Cleanup | Fail if 'rclone_service_name' is empty"
@@ -22,11 +23,13 @@
     name: "{{ rclone_service_name }}.service"
     state: stopped
     enabled: false
+  when: rclone_service_name_full in saltbox_managed_rclone_services
 
 - name: "Cleanup | Delete '{{ rclone_service_name }}.service'"
   ansible.builtin.file:
     path: "/etc/systemd/system/{{ rclone_service_name }}.service"
     state: absent
+  when: rclone_service_name_full in saltbox_managed_rclone_services
 
 - name: "Cleanup | Stop and disable existing '{{ rclone_refresh_service_name }}'"
   ansible.builtin.systemd:

diff --git a/roles/remote/tasks/main.yml b/roles/remote/tasks/main.yml
@@ -120,7 +120,7 @@
   loop: "{{ services | dict2items }}"
   loop_control:
     loop_var: rclone_service
-  when: (rclone_service_template in rclone_service.key)
+  when: (rclone_service_template in rclone_service.key) and (rclone_service.value.status != 'not-found')
 
 - name: Cleanup Tasks
   ansible.builtin.include_tasks: "cleanup.yml"