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

ironic/drivers/modules/ipmitool.py

@@ -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))
-            args.append(str(CONF.ipmi.min_command_interval))
-        else:
-            args.append('1')
 
     extra_args = {}
 

ironic/tests/unit/drivers/modules/test_ipmitool.py

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

releasenotes/notes/ipmi-retries-min-command-interval-070cd7eff5eb74dd.yaml

@@ -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.