Cleanup playbooks

playbooks/serguzim.net.yml

@@ -1,6 +1,8 @@
 ---
 - name: Run all roles
   hosts: serguzim_net
+  vars:
+    host_services: "{{ all_services | my_service_attributes(inventory_hostname) | union(common_services) }}"
   tasks:
     - name: Install software
       ansible.builtin.include_role:
@@ -10,28 +12,13 @@
       tags: software
       when: "inventory_hostname == 'node003'"
 
-    - name: Include common roles
-      ansible.builtin.include_role:
-        name: "{{ services_item }}"
-        apply:
-          tags: "{{ services_item }}"
-      tags: always
-      loop:
-        - always
-        - backup
-        - lego
-        - caddy
-        - watchtower
-      loop_control:
-        loop_var: services_item
-
     - name: Include service roles
       ansible.builtin.include_role:
         name: "{{ services_item }}"
         apply:
           tags: "{{ services_item }}"
       tags: always
-      loop: "{{ all_services | my_service_attributes(inventory_hostname) }}"
+      loop: "{{ host_services }}"
       loop_control:
         loop_var: services_item