From ad4a0195547415f37611dbd9d5cda9da4b2fb6e2 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Wed, 11 Mar 2026 03:51:00 +0100
Subject: [PATCH] feat(vmware): add hypervisor.node for ESXi host pinning
 (mutually exclusive with cluster)

---
 roles/global_defaults/defaults/main.yml    |  3 ++-
 roles/global_defaults/tasks/validation.yml | 17 +++++++++++++++++
 roles/virtualization/tasks/vmware.yml      |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/roles/global_defaults/defaults/main.yml b/roles/global_defaults/defaults/main.yml
index 2cb2cf8..37723b6 100644
--- a/roles/global_defaults/defaults/main.yml
+++ b/roles/global_defaults/defaults/main.yml
@@ -47,6 +47,7 @@ hypervisor_defaults:
   username: ""
   password: ""
   host: ""
+  node: ""
   storage: ""
   datacenter: ""
   cluster: ""
@@ -139,7 +140,7 @@ hypervisor_required_fields:
     hypervisor: [url, username, password, host, storage]
     system: [id]
   vmware:
-    hypervisor: [url, username, password, datacenter, cluster, storage]
+    hypervisor: [url, username, password, datacenter, storage]
     system: []
   xen:
     hypervisor: []
diff --git a/roles/global_defaults/tasks/validation.yml b/roles/global_defaults/tasks/validation.yml
index 5994378..def7feb 100644
--- a/roles/global_defaults/tasks/validation.yml
+++ b/roles/global_defaults/tasks/validation.yml
@@ -166,6 +166,23 @@
     label: "hypervisor.{{ item }}"
   no_log: true
 
+- name: Validate VMware placement (cluster or node required, mutually exclusive)
+  when:
+    - system_cfg.type == "virtual"
+    - hypervisor_type == "vmware"
+  ansible.builtin.assert:
+    that:
+      - >-
+        (hypervisor_cfg.cluster | default('') | string | length > 0)
+        or (hypervisor_cfg.node | default('') | string | length > 0)
+      - >-
+        (hypervisor_cfg.cluster | default('') | string | length == 0)
+        or (hypervisor_cfg.node | default('') | string | length == 0)
+    fail_msg: >-
+      VMware requires either hypervisor.cluster or hypervisor.node (mutually exclusive).
+      cluster targets a vSphere cluster; node targets a specific ESXi host.
+    quiet: true
+
 - name: Validate hypervisor-specific required system fields
   when:
     - system_cfg.type == "virtual"
diff --git a/roles/virtualization/tasks/vmware.yml b/roles/virtualization/tasks/vmware.yml
index 0bc89af..88d6d8f 100644
--- a/roles/virtualization/tasks/vmware.yml
+++ b/roles/virtualization/tasks/vmware.yml
@@ -32,7 +32,8 @@
           {%- endfor -%}
           {{ ns.out }}
       community.vmware.vmware_guest:
-        cluster: "{{ hypervisor_cfg.cluster }}"
+        cluster: "{{ hypervisor_cfg.cluster if (hypervisor_cfg.node | default('') | length == 0) else omit }}"
+        esxi_hostname: "{{ hypervisor_cfg.node if (hypervisor_cfg.node | default('') | length > 0) else omit }}"
         folder: "{{ system_cfg.path if system_cfg.path | string | length > 0 else omit }}"
         name: "{{ hostname }}"
         # Generic guest ID — VMware auto-detects OS post-install