Merge pull request #48 from derekhiggins/more-retrie-4.10

Bug 2053752: Bump retries for UEFI boot configuration
openshift · May 25, 2022 · 60a4ffd · 60a4ffd
2 parents f2d7ff1 + dec2a5e
commit 60a4ffd
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/hardware_manager/ironic_coreos_install.py b/hardware_manager/ironic_coreos_install.py
@@ -109,13 +109,17 @@ def install_coreos(self, node, ports):
         boot = hardware.dispatch_to_managers('get_boot_info')
         if boot.current_boot_mode == 'uefi':
             LOG.info('Configuring UEFI boot from device %s', root)
-            try:
-                efi_utils.manage_uefi(root)
-            except errors.CommandExecutionError as exc:
-                # https://bugzilla.redhat.com/show_bug.cgi?id=2057668
-                LOG.warning("UEFI boot configuration failed(retrying): %s", exc)
-                efi_utils.manage_uefi(root)
-
+            for count in range(6):
+                try:
+                    efi_utils.manage_uefi(root)
+                    break
+                except errors.CommandExecutionError as exc:
+                    if count < 5:
+                        time.sleep(5)
+                        # https://bugzilla.redhat.com/show_bug.cgi?id=2057668
+                        LOG.warning("UEFI boot configuration failed(retrying): %s", exc)
+                    else:
+                        raise exc
         LOG.info('Successfully installed via CoreOS installer on device %s',
                  root)