From 705d2fcd23e7bbe709c5028886132d562cbd1c82 Mon Sep 17 00:00:00 2001
From: Mark Janssen -- Sig-I/O Automatisering <mark@sig-io.nl>
Date: Thu, 11 Jul 2024 22:16:15 +0200
Subject: [PATCH] Remove is_vm, include vm.yaml

---
 common.yaml                     |  1 +
 group_vars/all.yaml             |  2 --
 group_vars/music.yaml           |  2 --
 roles/common/defaults/main.yaml |  1 -
 roles/common/tasks/main.yaml    | 14 ++++++++------
 roles/common/tasks/vm.yaml      |  7 +++++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/common.yaml b/common.yaml
index 3fe0c41..3e0cb27 100644
--- a/common.yaml
+++ b/common.yaml
@@ -1,5 +1,6 @@
 ---
 
 - hosts: debian
+  gather_facts: true
   roles:
     - common
diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index 9d1acdc..bdafa45 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -1,7 +1,5 @@
 ---
 
-is_vm: true
-
 ansible_user: root
 ansible_python_interpreter: auto_silent
 notify_email: bestuur@bitlair.nl
diff --git a/group_vars/music.yaml b/group_vars/music.yaml
index ae98bff..ee9235b 100644
--- a/group_vars/music.yaml
+++ b/group_vars/music.yaml
@@ -5,8 +5,6 @@ root_access:
   - foobar
   - polyfloyd
 
-is_vm: false
-
 music_domain: music.bitlair.nl
 acme_san_domains:
   - [ music.bitlair.nl ]
diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml
index dfa8a76..5512d86 100644
--- a/roles/common/defaults/main.yaml
+++ b/roles/common/defaults/main.yaml
@@ -1,5 +1,4 @@
 ssh_port: "22"
-is_vm: false
 unattended_upgrades_auto_reboot_time: "04:00"
 unattended_upgrades_extra_origin_patterns: []
 trusted_ranges:
diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml
index 92defe1..99c99ed 100644
--- a/roles/common/tasks/main.yaml
+++ b/roles/common/tasks/main.yaml
@@ -31,24 +31,26 @@
   when: root_access is defined and root_access
   tags: authorized_keys
 
-- tags: network
+- name: Import network tasks
   ansible.builtin.import_tasks:
     file: network.yaml
+  tags: network
 
-- tags: node-exporter
+- name: Import node-exporter
   ansible.builtin.import_tasks:
     file: node-exporter.yaml
+  tags: node-exporter
 
-- tags: vm
+- name: Import vm tasks
   ansible.builtin.import_tasks:
-    file: node-exporter.yaml
-  when: is_vm
+    file: vm.yaml
+  tags: vm
 
 - name: Remove debian-packages we don't want
   ansible.builtin.apt:
     state: absent
     autoremove: true
-    pkg: {{ debian_packages_unwanted|default([]) }}
+    pkg: "{{ debian_packages_unwanted|default([]) }}"
 
 - name: Install standard packages
   ansible.builtin.apt:
diff --git a/roles/common/tasks/vm.yaml b/roles/common/tasks/vm.yaml
index 1834bd9..505c03f 100644
--- a/roles/common/tasks/vm.yaml
+++ b/roles/common/tasks/vm.yaml
@@ -2,6 +2,9 @@
 - name: Install guest agent
   ansible.builtin.apt:
     name: qemu-guest-agent
+  when: ansible_virtualization_role|default(false) == 'guest'
+  tags:
+    - questagent
 
 - name: Serial Console
   ansible.builtin.lineinfile:
@@ -11,5 +14,5 @@
   notify:
     - update grub
     - reboot
-
-- ansible.builtin.meta: flush_handlers
+  tags:
+    - questagent