diff options
| author | Ruby Loo <ruby.loo@intel.com> | 2017-07-11 12:43:08 -0400 |
|---|---|---|
| committer | Ruby Loo <ruby.loo@intel.com> | 2017-07-13 10:19:27 -0400 |
| commit | 578f01678c6e1b919bf1b0b48868a1c3204ca04f (patch) | |
| tree | 0528d5e8e7238edf76e6a581aaa7ec4e635b4182 /ironic/conf/ipmi.py | |
| parent | bc5efdf45973941347752d3d5eabbffcefad971f (diff) | |
| download | ironic-578f01678c6e1b919bf1b0b48868a1c3204ca04f.tar.gz | |
Follow-up to fix for power action failure
This is a follow-up patch to the patch so that the power status
is not retried if a power action fails:
ee5d4942a1c33736ffe05ec01619142be400c2f4
It addresses the comments as well as adds more clarification
and updates the documentation to refer to the new
[ipmi]command_retry_timeout config option.
Change-Id: Ib21544da260565ae399e2d07b32af9bd8b810280
Related-Bug: #1692895
Diffstat (limited to 'ironic/conf/ipmi.py')
| -rw-r--r-- | ironic/conf/ipmi.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ironic/conf/ipmi.py b/ironic/conf/ipmi.py index e79daf5bd..c62b71dbb 100644 --- a/ironic/conf/ipmi.py +++ b/ironic/conf/ipmi.py @@ -22,9 +22,10 @@ from ironic.common.i18n import _ opts = [ cfg.IntOpt('command_retry_timeout', default=60, - help=_('Maximum time in seconds to retry, retryable IPMI ' - 'operations. For example if the requested action fails ' - 'because the BMC is busy. There is a tradeoff when ' + help=_('Maximum time in seconds to retry retryable IPMI ' + 'operations. (An operation is retryable, for ' + 'example, if the requested operation fails ' + 'because the BMC is busy.) There is a tradeoff when ' 'setting this value. Setting this too low may cause ' 'older BMCs to crash and require a hard reset. However, ' 'setting too high can cause the sync power state ' @@ -38,13 +39,14 @@ opts = [ 'sync power state periodic task to hang when there are ' 'slow or unresponsive BMCs.'), deprecated_for_removal=True, - deprecated_reason=_('Option ipmi.command_retry_timeout should ' - 'be used to define IPMI command retries ' - 'and option ' - 'conductor.power_state_change_timeout ' - 'should be use to define timeout value for ' - 'waiting for power operations to ' - 'complete')), + deprecated_reason=_('Use option [ipmi]/command_retry_timeout ' + 'to specify the timeout value for ' + 'IPMI command retries, and use option ' + '[conductor]/power_state_change_timeout to ' + 'specify the timeout value for waiting for ' + 'a power operation to complete so that a ' + 'baremetal node reaches the desired ' + 'power state.')), cfg.IntOpt('min_command_interval', default=5, help=_('Minimum time, in seconds, between IPMI operations ' |