Merge "Add parameter IronicPowerStateChangeTimeout" into stable/train

This commit is contained in:
Zuul 2021-11-03 09:36:07 +00:00 committed by Gerrit Code Review
commit 960705b99c
2 changed files with 16 additions and 1 deletions

View File

@ -193,6 +193,13 @@ parameters:
default: 60 default: 60
description: iPXE timeout in second. Set to 0 for infinite timeout. description: iPXE timeout in second. Set to 0 for infinite timeout.
type: string type: string
IronicPowerStateChangeTimeout:
default: 60
description: Number of seconds to wait for power operations to
complete, i.e., so that a baremetal node is in the
desired power state. If timed out, the power operation
is considered a failure.
type: string
IronicPassword: IronicPassword:
description: The password for the Ironic service and db account, used by the Ironic services description: The password for the Ironic service and db account, used by the Ironic services
type: string type: string
@ -303,7 +310,6 @@ outputs:
if: if:
- enable_architecture_ppc64le - enable_architecture_ppc64le
- ironic::pxe::enable_ppc64le: true - ironic::pxe::enable_ppc64le: true
ironic::conductor::power_state_change_timeout: 60
ironic::drivers::ipmi::command_retry_timeout: 120 ironic::drivers::ipmi::command_retry_timeout: 120
ironic::drivers::ipmi::min_command_interval: 15 ironic::drivers::ipmi::min_command_interval: 15
- {} - {}
@ -316,6 +322,7 @@ outputs:
ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes} ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes}
ironic::conductor::force_power_state_during_sync: {get_param: IronicForcePowerStateDuringSync} ironic::conductor::force_power_state_during_sync: {get_param: IronicForcePowerStateDuringSync}
ironic::conductor::allow_provisioning_in_maintenance: false ironic::conductor::allow_provisioning_in_maintenance: false
ironic::conductor::power_state_change_timeout: {get_param: IronicPowerStateChangeTimeout}
# We need an endpoint containing a real IP, not a VIP here # We need an endpoint containing a real IP, not a VIP here
ironic_conductor_http_host: ironic_conductor_http_host:
str_replace: str_replace:

View File

@ -0,0 +1,8 @@
---
features:
- |
A heat parameter ``IronicPowerStateChangeTimeout`` has been added which sets
the number of seconds to wait for power operations to complete, i.e., so
that a baremetal node is in the desired power state. If timed out, the power
operation is considered a failure. The default is 60 seconds, which is the
same as the current Ironic default.