From a5316a80a779eae49dc737f80bf67605099c3224 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Mon, 21 Oct 2024 23:37:11 +0200
Subject: [PATCH] Configure playbook

---
 inventory.ini                    |  1 +
 roles/services/defaults/main.yml |  2 +-
 site.yml                         | 39 ++++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/inventory.ini b/inventory.ini
index 46a9ef0..fcbdc1c 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -14,6 +14,7 @@ varsa
 folald
 
 [virtual:children]
+monitoring
 production
 staging
 control
diff --git a/roles/services/defaults/main.yml b/roles/services/defaults/main.yml
index 648ef44..a5bec5d 100644
--- a/roles/services/defaults/main.yml
+++ b/roles/services/defaults/main.yml
@@ -229,4 +229,4 @@ services:
 services_exclude:
   - uptime_kuma
 
-services_include: "{{ services | dict2items | map(attribute='key') | list | community.general.lists_difference(services_exclude) }}"
+services_include: "{{ services | dict2items | map(attribute='key') | community.general.lists_difference(services_exclude) }}"
diff --git a/site.yml b/site.yml
index 8b44477..01db057 100644
--- a/site.yml
+++ b/site.yml
@@ -1,15 +1,34 @@
 # vim: ft=yaml.ansible
 # code: language=ansible
 ---
-- hosts: all
+- name: Provision all VMs
+  hosts: virtual
   gather_facts: true
   become: true
-  roles:
-    - name: vm-common
-      tags: [base_only]
-    # - name: zfs
-    #   tags: [zfs]
-    - name: docker
-      tags: [docker]
-    - name: services
-      tags: [services]
+  tasks:
+    - name: Include role 'vm-common'
+      ansible.builtin.include_role:
+        name: vm-common
+
+    - name: Include role 'docker'
+      ansible.builtin.include_role:
+        name: docker
+      when: vm_type == 'app' or
+            vm_type == 'uptime'
+            vm_type == 'runner'
+
+    # - name: Include role 'zfs'
+    #   ansible.builtin.include_role:
+    #     name: zfs
+    #   when: vm_type == 'app'
+
+    - name: Include role 'services'
+      ansible.builtin.include_role:
+        name: services
+      when: vm_type == 'app' or
+            vm_type == 'uptime'
+
+    # - name: Include role 'jumphost'
+    #   ansible.builtin.include_role:
+    #     name: jumpthost
+    #   when: vm_type == 'control'