openstack/ironic
Code Issues Proposed changes

Merge "Use min_command_interval when ironic does IPMI retries"

Browse Source
This commit is contained in:
Zuul 2020-07-15 12:43:47 +00:00 committed by Gerrit Code Review
commit 079b22a800
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/ipmitool.py
View File

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

2
ironic/tests/unit/drivers/modules/test_ipmitool.py
View File

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

6
releasenotes/notes/ipmi-retries-min-command-interval-070cd7eff5eb74dd.yaml Normal file
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.