diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-02 12:33:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-02 12:33:57 +0000 |
| commit | df92f8089eef5925bd827ea2705b40916633fbca (patch) | |
| tree | 10dc3dfdce950bb1c3b401a37941d8824fb28c9c /ironic/drivers/modules/redfish | |
| parent | c57daacf624af5a9a82746f34e608b510bdac564 (diff) | |
| parent | 0fe0122466e3ea033661699e6c18ef062be4685b (diff) | |
| download | ironic-df92f8089eef5925bd827ea2705b40916633fbca.tar.gz | |
Merge "Revert "Allow reboot to hard disk following iso ramdisk deploy.""
Diffstat (limited to 'ironic/drivers/modules/redfish')
| -rw-r--r-- | ironic/drivers/modules/redfish/boot.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ironic/drivers/modules/redfish/boot.py b/ironic/drivers/modules/redfish/boot.py index d95d74a8e..dfc0d5d38 100644 --- a/ironic/drivers/modules/redfish/boot.py +++ b/ironic/drivers/modules/redfish/boot.py @@ -639,11 +639,7 @@ class RedfishVirtualMediaBoot(base.BootInterface): del managers - persistent = True - if node.driver_info.get('force_persistent_boot_device', - 'Default') == 'Never': - persistent = False - self._set_boot_device(task, boot_devices.CDROM, persistent=persistent) + self._set_boot_device(task, boot_devices.CDROM, persistent=True) LOG.debug("Node %(node)s is set to permanently boot from " "%(device)s", {'node': task.node.uuid, |