ansible refactor to newer methods

1 files changed, 11 insertions, 36 deletions

diff --git a/ansible/playbooks/init.yaml b/ansible/playbooks/init.yaml
index 0b8d58e..0b22716 100644
--- a/ansible/playbooks/init.yaml
+++ b/ansible/playbooks/init.yaml
@@ -1,13 +1,15 @@
 ---
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=vault
 - name: 'Deploy Vault'
   hosts: 'vault'
-  tags: ["never", "vault"]
   gather_facts: false
+  pre_tasks: &pretasks_common
+    - name: 'Check that limit is set'
+      fail:
+        msg: 'Must apply limit on hosts'
+      when: 'ansible_limit is not defined'
+      tags: ["always"]
   roles:
-    - role: 'base'
-    - role: 'docker'
     - role: 'vault'
     - role: 'caddy_add'
       vars:
@@ -15,34 +17,23 @@
         caddy_add_upstream_host: '{{ inventory_hostname }}'
         caddy_add_upstream_port: 8989
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=torrents
 - name: 'Deploy Transmission'
   hosts: 'torrents'
-  tags: ["never", "torrents"]
   gather_facts: false
+  pre_tasks: *pretasks_common
   roles:
-    - role: 'base'
     - role: 'torrents'
-      vars:
-        torrents_nas_mount_path: '{{ vaultvar_torrents_nas_nfs_path }}'
-        torrents_rpc_username: '{{ vaultvar_torrents_rpc_username }}'
-        torrents_rpc_password: '{{ vaultvar_torrents_rpc_password }}'
     - role: 'caddy_add'
       vars:
         caddy_add_hosts: ['{{ vaultvar_torrents_cname }}.{{ vaultvar_root_domain }}']
         caddy_add_upstream_host: '{{ inventory_hostname }}'
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=med_dl
 - name: 'Deploy Media Downloaders'
   hosts: 'med-dl'
-  tags: ["never", "med_dl"]
   gather_facts: false
+  pre_tasks: *pretasks_common
   roles:
-    - role: 'base'
-    - role: 'docker'
     - role: 'med_dl'
-      vars:
-        med_dl_nas_mount_path: '{{ vaultvar_med_dl_nas_nfs_path }}'
     - role: 'caddy_add'
       vars:
         caddy_add_hosts: ['{{ vaultvar_sonarr_cname }}.{{ vaultvar_root_domain }}']
@@ -59,48 +50,32 @@
         caddy_add_upstream_host: '{{ inventory_hostname }}'
         caddy_add_upstream_port: 8686
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=nextcloud
 - name: 'Deploy Nextcloud'
   hosts: 'nc'
-  tags: ["never", "nc"]
   gather_facts: false
+  pre_tasks: *pretasks_common
   roles:
-    - role: 'base'
-    - role: 'docker'
     - role: 'nextcloud'
-      vars:
-        nextcloud_nas_mount_path: '{{ vaultvar_nextcloud_nas_nfs_path }}'
-        nextcloud_php_max_mem_mb: 8000
-        nextcloud_php_max_upload_size_gb: 10
-        # You should have DRI devices showing up in your container in `/dev/dri/`.
-        # See the TF readme for steps to enable this.
-        # If not, then set this to false here.
-        # Leave this as a yaml string, it is going to used as a shell var.
-        nextcloud_enable_dri: 'true'
     - role: 'caddy_add'
       vars:
         caddy_add_hosts: ['{{ vaultvar_nextcloud_cname }}.{{ vaultvar_root_domain }}']
         caddy_add_upstream_host: '{{ inventory_hostname }}'
         caddy_add_upstream_port: 11000
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=plex
 - name: 'Deploy Plex'
   hosts: 'plex'
-  tags: ["never", "plex"]
   gather_facts: false
+  pre_tasks: *pretasks_common
   roles:
-    - role: 'base'
     - role: 'plex'
       vars:
         plex_nas_mount_path: '{{ vaultvar_plex_nas_nfs_path }}'
 
-# ansible-playbook -u root -i 'hosts' --vault-id vaultkey playbooks/init.yaml --tags=monitoring
 - name: 'Deploy Prometheus'
   hosts: 'monitoring'
-  tags: ["never", "monitoring"]
   gather_facts: false
+  pre_tasks: *pretasks_common
   roles:
-    - role: 'base'
     - role: 'monitoring'
     - role: 'caddy_add'
       vars: