diff --git a/roles/cleanup/defaults/main.yml b/roles/cleanup/defaults/main.yml index 76a1669..c4de81f 100644 --- a/roles/cleanup/defaults/main.yml +++ b/roles/cleanup/defaults/main.yml @@ -3,7 +3,5 @@ cleanup_verify_boot: true cleanup_boot_timeout: 300 cleanup_remove_on_failure: true - -# How long to let the guest finish the shutdown started in shutdown.yml before forcing it off cleanup_poweroff_retries: 24 cleanup_poweroff_delay: 5 diff --git a/roles/cleanup/tasks/proxmox.yml b/roles/cleanup/tasks/proxmox.yml index bbef25b..4c45357 100644 --- a/roles/cleanup/tasks/proxmox.yml +++ b/roles/cleanup/tasks/proxmox.yml @@ -8,10 +8,6 @@ community.proxmox.proxmox_kvm: "{{ _proxmox_auth_node }}" community.proxmox.proxmox_vm_info: "{{ _proxmox_auth_node }}" block: - # shutdown.yml halts the guest without waiting for it, so stopping a VM Proxmox has - # already stopped errors out. Wait the shutdown out, and force off only a guest that - # ignored it. The disks come off afterwards, so they are never detached from a - # running VM. - name: Wait for the installer environment to power off community.proxmox.proxmox_vm_info: vmid: "{{ system_cfg.id }}" diff --git a/roles/cleanup/tasks/vmware.yml b/roles/cleanup/tasks/vmware.yml index 7c81ada..af93179 100644 --- a/roles/cleanup/tasks/vmware.yml +++ b/roles/cleanup/tasks/vmware.yml @@ -9,9 +9,6 @@ vmware.vmware.vm_powerstate: "{{ _vmware_auth }}" no_log: true block: - # shutdown.yml halts the guest without waiting for it, so powering off a VM that - # vCenter has already stopped raises InvalidPowerState. Wait the shutdown out, and - # force off only a guest that ignored it. - name: Wait for the installer environment to power off community.vmware.vmware_guest_info: name: "{{ hostname }}"