diff --git a/nova/core/roles/powerstate/defaults/main.yml b/nova/core/roles/powerstate/defaults/main.yml index c8cc77e4..03315255 100644 --- a/nova/core/roles/powerstate/defaults/main.yml +++ b/nova/core/roles/powerstate/defaults/main.yml @@ -4,3 +4,9 @@ poweron: false poweroff: false restart: false reset: false + +# Delays +shutdown_shutting_retries: 5 +shutdown_shutting_delay: 2 +shutdown_waiting_retries: 18 +shutdown_waiting_delay: 10 diff --git a/nova/core/roles/powerstate/vsphere/shutdown.yml b/nova/core/roles/powerstate/vsphere/shutdown.yml index 2a439d13..62278cfb 100644 --- a/nova/core/roles/powerstate/vsphere/shutdown.yml +++ b/nova/core/roles/powerstate/vsphere/shutdown.yml @@ -9,8 +9,8 @@ vm: "{{ vcenter_vm_info.value[0].vm }}" register: vcenter_vm_stop until: not vcenter_vm_stop.failed - retries: 5 - delay: 2 + retries: "{{ shutdown_shutting_retries }}" + delay: "{{ shutdown_shutting_delay }}" when: vcenter_vm_info.value[0].power_state != "POWERED_OFF" - name: Waiting for {{ custom_vm_name | default(vm_name) }} shutdown... @@ -20,5 +20,5 @@ until: - shutdown_status.value.state is defined - shutdown_status.value.state == "NOT_RUNNING" - retries: 18 - delay: 10 + retries: "{{ shutdown_waiting_retries }}" + delay: "{{ shutdown_waiting_delay }}"