From 30d81a1ab54798e3440e835f7f8d92e774ce7375 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Fri, 9 Sep 2022 16:39:59 +0100
Subject: [PATCH] separated out playbook into multiple smaller plays

---
 group_vars/linodes.yml      |  2 --
 group_vars/servers.yml      |  2 --
 host_vars/qnap.yml          |  3 ---
 hosts.ini                   |  6 ++++++
 playbooks/setup-homelab.yml | 43 ++++++++++++++-----------------------
 5 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/group_vars/linodes.yml b/group_vars/linodes.yml
index d982135..f48ada5 100644
--- a/group_vars/linodes.yml
+++ b/group_vars/linodes.yml
@@ -16,5 +16,3 @@ services:
 # any additional docker networks that should be created
 docker_networks:
   - mariadb_net
-
-restore_from_s3: false
diff --git a/group_vars/servers.yml b/group_vars/servers.yml
index 6beeccb..2715e7a 100644
--- a/group_vars/servers.yml
+++ b/group_vars/servers.yml
@@ -5,8 +5,6 @@ backups:
 
 homelab_user: &main_user cianhatton
 
-configure_mergerfs: false
-configure_samba: false
 samba_group: smbgroup
 samba_user: smbuser
 users:
diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index e4f3786..c7ca029 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -1,7 +1,6 @@
 # all encrypted variables should go in the linked file.
 vault_file: vault_vars/qnap-vault.yml
 # any qnap specific variables go here
-configure_mergerfs: true
 mounts:
   - path: /mnt/mergerfs
     state: mounted
@@ -12,8 +11,6 @@ mounts:
     options: allow_other,use_ino
 
 
-configure_samba: true
-
 cron_hour: "5"
 
 devices:
diff --git a/hosts.ini b/hosts.ini
index 7268f53..f525a09 100644
--- a/hosts.ini
+++ b/hosts.ini
@@ -18,6 +18,12 @@ qnap
 qnap
 snunmu
 
+[mergerfs]
+qnap
+
+[samba]
+qnap
+
 # BEGIN ANSIBLE MANAGED BLOCK
 [linodes]
 # END ANSIBLE MANAGED BLOCK
diff --git a/playbooks/setup-homelab.yml b/playbooks/setup-homelab.yml
index da3913f..0a39926 100644
--- a/playbooks/setup-homelab.yml
+++ b/playbooks/setup-homelab.yml
@@ -1,5 +1,5 @@
 ---
-- name: Update packages and ensure users on all hosts
+- name: Update packages and ensure users on all hosts.
   hosts: all
   become: true
   pre_tasks:
@@ -10,14 +10,26 @@
   roles:
     - role: setup_users
 
+- name: Configure mergerfs pools.
+  hosts: mergerfs
+  become: true
+  roles:
+    - role: setup_mergerfs
+      tags: [mergerfs]
+
+- name: Configure samba shares.
+  hosts: samba
+  become: true
+  roles:
+    - role: setup_samba
+      tags: [samba]
 
 - name: Install Docker on Docker hosts.
   hosts: docker
   become: true
   roles:
-    - geerlingguy.pip
-    - geerlingguy.docker
-
+    -  geerlingguy.pip
+    -  geerlingguy.docker
 
 - name: Install Portainer on Portainer host.
   hosts: portainer
@@ -38,29 +50,6 @@
     - name: Include vault variables.
       ansible.builtin.include_vars: '../{{ vault_file }}'
       tags: [always]
-
   roles:
-    - role: setup_mergerfs
-      tags: [mergerfs]
-      when: configure_mergerfs
-    - role: setup_samba
-      when: configure_samba
-      tags: [samba]
-    - role: setup_hosted_services
-      tags: [services]
-
-- name: Setup home lab on linode instances.
-  hosts: linodes
-  become: true
-  pre_tasks:
-    - name: Include vault variables.
-      ansible.builtin.include_vars: '../{{ vault_file }}'
-      tags: [always]
-
-  roles:
-    - role: setup_samba
-      tags: [samba]
-    - role: setup_docker
-      tags: [docker]
     - role: setup_hosted_services
       tags: [services]