Use min_command_interval when ironic does IPMI retries

For certain BMCs the default of 1 second is too short for the ipmitool
minimum command interval (-N).  The configured
``[ipmi]min_command_interval`` should be used.

Story: 2007914
Task: 40317

Change-Id: I07f17a7321582e9829ac422efb51b571a17c5ca8
This commit is contained in:
Bob Fournier 2020-07-10 09:36:57 -04:00
parent bf65acf6ba
commit a7445d9f85
3 changed files with 8 additions and 5 deletions

View File

@ -486,10 +486,7 @@ def _exec_ipmitool(driver_info, command, check_exit_code=None,
args.append('1')
args.append('-N')
if CONF.ipmi.use_ipmitool_retries:
args.append(str(CONF.ipmi.min_command_interval))
else:
args.append('1')
args.append(str(CONF.ipmi.min_command_interval))
extra_args = {}

View File

@ -1057,7 +1057,7 @@ class IPMIToolPrivateMethodTestCase(
'-U', self.info['username'],
'-v',
'-R', '1',
'-N', '1',
'-N', '5',
'-f', awesome_password_filename,
'A', 'B', 'C',
]

View File

@ -0,0 +1,6 @@
---
fixes:
- |
When Ironic is doing IPMI retries the configured ``min_command_interval``
should be used instead of a default value of ``1``, which may be too short
for some BMCs.