inventory/hosts.yml

@@ -11,7 +11,5 @@ api_endpoint: "https://netbox.desu.ltd"
 group_by:
   - device_roles
   - tags
-  - device_types
-  - manufacturers
 device_query_filters:
   - has_primary_ip: "true"

playbooks/desktop.yml

@@ -25,6 +25,8 @@
       tags: [ desktop, udev ]
     - role: pulseaudio
       tags: [ desktop, pulse, pulseaudio ]
+    - role: zerotier
+      tags: [ desktop, zerotier ]
 - hosts: lap-s76-lemp9-0.desu.ltd
   roles:
     - role: desktop

playbooks/pis.yml

@@ -2,9 +2,12 @@
 # vim:ft=ansible:
 ---
 # General configuration
-- hosts: manufacturers_raspi
+- hosts: tags_pis
+  roles:
+    - role: zerotier
+      tags: [ pis, zerotier ]
   tasks:
-    - name: install raspi packages
+    - name: install basic packages
       apt:
         name:
           - libraspberrypi-bin

playbooks/zerotier.yml

@@ -1,15 +0,0 @@
-#!/usr/bin/env ansible-playbook
-# vim:ft=ansible:
----
-- hosts: tags_zerotier
-  roles:
-    - role: zerotier
-      tags: [ zerotier ]
-- hosts: all
-  tasks:
-    - name: disable zerotier when not tagged
-      systemd: name={{ item }} state=stopped enabled=no
-      with_items:
-        - zerotier-one.service
-      when: "'tags_zerotier' not in group_names and item in services"
-      tags: [ zerotier ]