From ccf3193c9256a1569008b47efd910a6464e96412 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Thu, 31 Oct 2024 01:12:51 +0100
Subject: [PATCH] improve VMware cleanup

---
 main.yml                     |  2 +-
 roles/cleanup/tasks/main.yml | 69 ++++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/main.yml b/main.yml
index ce1f181..385d9c8 100644
--- a/main.yml
+++ b/main.yml
@@ -80,7 +80,7 @@
 
   tasks:
     - name: Reboot system
-      when: hypervisor != "libvirt"
+      when: hypervisor == "proxmox"
       ansible.builtin.command: reboot
       failed_when: false
       changed_when: result.rc == 0
diff --git a/roles/cleanup/tasks/main.yml b/roles/cleanup/tasks/main.yml
index 8684e01..2b82a75 100644
--- a/roles/cleanup/tasks/main.yml
+++ b/roles/cleanup/tasks/main.yml
@@ -22,31 +22,56 @@
         - ide0
         - ide2
 
-- name: Remove CD-ROM from VM in vCenter
+- name: Clean vCenter VM
   when: hypervisor == "vmware"
   delegate_to: localhost
   become: false
-  failed_when: false
-  community.vmware.vmware_guest:
-    hostname: "{{ hypervisor_url }}"
-    username: "{{ hypervisor_username }}"
-    password: "{{ hypervisor_password }}"
-    validate_certs: false
-    datacenter: "{{ hypervisor_cluster }}"
-    name: "{{ hostname }}"
-    cdrom:
-      - controller_number: 0
-        unit_number: 0
-        controller_type: sata
-        type: iso
-        iso_path: "{{ boot_iso }}"
-        state: absent
-      - controller_number: 0
-        unit_number: 1
-        controller_type: sata
-        type: iso
-        iso_path: "{{ rhel_iso | default(omit) }}"
-        state: absent
+  block:
+    - name: Shutdown VM in vCenter
+      when: hypervisor == "vmware"
+      community.vmware.vmware_guest_powerstate:
+        hostname: "{{ hypervisor_url }}"
+        username: "{{ hypervisor_username }}"
+        password: "{{ hypervisor_password }}"
+        validate_certs: false
+        datacenter: "{{ hypervisor_cluster }}"
+        name: "{{ hostname }}"
+        state: powered-off
+
+    - name: Remove CD-ROM from VM in vCenter
+      when: hypervisor == "vmware"
+      failed_when: false
+      community.vmware.vmware_guest:
+        hostname: "{{ hypervisor_url }}"
+        username: "{{ hypervisor_username }}"
+        password: "{{ hypervisor_password }}"
+        validate_certs: false
+        datacenter: "{{ hypervisor_cluster }}"
+        name: "{{ hostname }}"
+        cdrom:
+          - controller_number: 0
+            unit_number: 0
+            controller_type: sata
+            type: iso
+            iso_path: "{{ boot_iso }}"
+            state: absent
+          - controller_number: 0
+            unit_number: 1
+            controller_type: sata
+            type: iso
+            iso_path: "{{ rhel_iso | default(omit) }}"
+            state: absent
+
+    - name: Start VM in vCenter
+      when: hypervisor == "vmware"
+      community.vmware.vmware_guest_powerstate:
+        hostname: "{{ hypervisor_url }}"
+        username: "{{ hypervisor_username }}"
+        password: "{{ hypervisor_password }}"
+        validate_certs: false
+        datacenter: "{{ hypervisor_cluster }}"
+        name: "{{ hostname }}"
+        state: powered-on
 
 - name: Remove Archiso and cloud-init disks
   when: hypervisor == "libvirt"