Fix up workstation device roles

playbooks/device_roles_workstation.yml

@@ -4,26 +4,17 @@
   # Home desktops
 - hosts: device_roles_workstation
   roles:
+    - role: backup
+      vars:
+        backup_s3backup_tar_args_extra: h
+        backup_s3backup_list_extra:
+          - /home/salt
+      tags: [ backup ]
+    - role: desktop
+      tags: [ desktop ]
     - role: udev
       vars:
         udev_rules:
             # Switch RCM stuff
           - SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0664", GROUP="plugdev"
       tags: [ desktop, udev ]
-- hosts: lap-fw-diy-1.ws.mgmt.desu.ltd,lap-s76-lemp13-0.ws.mgmt.desu.ltd
-  roles:
-    - role: backup
-      vars:
-        backup_s3backup_tar_args_extra: h
-        backup_s3backup_list_extra:
-          - /home/salt/.backup/
-      tags: [ backup ]
-- hosts: dsk-ryzen-1.ws.mgmt.desu.ltd
-  roles:
-    - role: desktop
-    - role: backup
-      vars:
-        backup_s3backup_tar_args_extra: h
-        backup_s3backup_list_extra:
-          - /home/salt/.backup/
-      tags: [ backup ]