Docker goes on everything

inventory/host_vars/dsk-ryzen-0.desu.ltd.yml

@@ -0,0 +1,2 @@
+# vim:ft=ansible
+docker_apt_repository: "deb https://download.docker.com/linux/ubuntu focal stable"

playbooks/desktop.yml

@@ -37,8 +37,6 @@
       tags: [ desktop, zerotier ]
 - hosts: lap-s76-lemp9-0.desu.ltd
   roles:
-    - role: docker
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       vars:
         desktop_apt_keys_url_extra:
@@ -75,10 +73,6 @@
       tags: [ desktop, grub ]
 - hosts: dsk-ryzen-0.desu.ltd
   roles:
-    - role: docker
-      vars:
-        docker_apt_repository: "deb https://download.docker.com/linux/ubuntu focal stable"
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       tags: [ desktop, desktop-role ]
 #    - role: grub

playbooks/game.yml

@@ -11,8 +11,6 @@
         backup_s3backup_exclude_list_extra:
           - /data/minecraft/valhelsia3/backups
       tags: [ backup ]
-    - role: docker
-      tags: [ docker, skip-pull ]
 - hosts: game1.desu.ltd
   tasks:
     - name: include tasks for gameservers

playbooks/pis.yml

@@ -6,8 +6,6 @@
   roles:
     - role: zerotier
       tags: [ pis, zerotier ]
-    - role: docker
-      tags: [ pis, docker, skip-pull ]
   tasks:
     - name: install basic packages
       apt:

playbooks/web.yml

@@ -47,8 +47,6 @@
           - /var/lib/gitea/log
           - /data/gitea/data/gitea/log
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]
     - role: certbot
       tags: [ web, certbot ]
     - role: php
@@ -127,8 +125,6 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]
 - hosts: web3.desu.ltd
   module_defaults:
     docker_container:
@@ -178,5 +174,3 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]

site.yml

@@ -8,6 +8,8 @@
       tags: [ common ]
     - role: adminuser
       tags: [ adminuser, common ]
+    - role: docker
+      tags: [ docker, common, skip-pull ]
     - role: motd
       vars:
         motd_watch_services_extra: