Browse Source

Merge "Use min_command_interval when ironic does IPMI retries" into stable/ussuri

tags/15.0.1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
544ae9cd8a
3 changed files with 8 additions and 5 deletions
  1. +1
    -4
      ironic/drivers/modules/ipmitool.py
  2. +1
    -1
      ironic/tests/unit/drivers/modules/test_ipmitool.py
  3. +6
    -0
      releasenotes/notes/ipmi-retries-min-command-interval-070cd7eff5eb74dd.yaml

+ 1
- 4
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('-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 = {}



+ 1
- 1
ironic/tests/unit/drivers/modules/test_ipmitool.py View File

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


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

Loading…
Cancel
Save