diff --git a/driver-requirements.txt b/driver-requirements.txt
index 6fa7fdf8c6..35e1a07e79 100644
--- a/driver-requirements.txt
+++ b/driver-requirements.txt
@@ -14,8 +14,8 @@ python-seamicroclient>=0.4.0
 UcsSdk==0.8.2.2
 python-dracclient>=0.0.5
 
-# The amt driver import a python module called "pywsman", however, this does
-# not exist on pypi.
+# The amt driver imports a python module called "pywsman", but this does not
+# exist on pypi.
 # It is installed by the openwsman-python (on RH) or python-openwsman (on deb)
 # package, from https://github.com/Openwsman/openwsman/blob/master/bindings/python/Makefile.am#L29
 # There is *also* a "wsman" module on pypi ... but I think that's the wrong one.
diff --git a/ironic/drivers/modules/drac/power.py b/ironic/drivers/modules/drac/power.py
index acd6965455..2596e827b2 100644
--- a/ironic/drivers/modules/drac/power.py
+++ b/ironic/drivers/modules/drac/power.py
@@ -67,13 +67,15 @@ def _commit_boot_list_change(node):
     driver_internal_info = node.driver_internal_info
 
     boot_device = node.driver_internal_info.get('drac_boot_device')
-    if boot_device is not None:
-        drac_management.set_boot_device(node, boot_device['boot_device'],
-                                        boot_device['persistent'])
+    if boot_device is None:
+        return
 
-        driver_internal_info['drac_boot_device'] = None
-        node.driver_internal_info = driver_internal_info
-        node.save()
+    drac_management.set_boot_device(node, boot_device['boot_device'],
+                                    boot_device['persistent'])
+
+    driver_internal_info['drac_boot_device'] = None
+    node.driver_internal_info = driver_internal_info
+    node.save()
 
 
 def _set_power_state(node, power_state):
diff --git a/releasenotes/notes/drac-migrate-to-dracclient-2bd8a6d1dd3fdc69.yaml b/releasenotes/notes/drac-migrate-to-dracclient-2bd8a6d1dd3fdc69.yaml
index 2f623600ae..c47d92e027 100644
--- a/releasenotes/notes/drac-migrate-to-dracclient-2bd8a6d1dd3fdc69.yaml
+++ b/releasenotes/notes/drac-migrate-to-dracclient-2bd8a6d1dd3fdc69.yaml
@@ -8,6 +8,7 @@ fixes:
     operations.
 upgrade:
   - Dependency for DRAC driver changed from ``pywsman`` to
-    ``python-dracclient``. Exceptions thrown by the driver and return values of
-    the ``set_bios_config``, ``commit_bios_config`` and ``abandon_bios_config``
-    methods changed on the vendor-passthru interface.
+    ``python-dracclient`` with version >= 0.0.5. Exceptions thrown by the
+    driver and return values of the ``set_bios_config``, ``commit_bios_config``
+    and ``abandon_bios_config`` methods changed on the vendor-passthru
+    interface.