Merge "BIOS Settings: Add BIOSInterface"

2 files changed, 9 insertions, 3 deletions

diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index d79104aa8..b66c931d0 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -1872,6 +1872,11 @@ class ConductorManager(base_manager.BaseConductorManager):
                                               task.node.instance_info)
             task.node.driver_internal_info['is_whole_disk_image'] = iwdi
             for iface_name in task.driver.non_vendor_interfaces:
+                # TODO(zshi): Remove this check in 'bios' API patch
+                # Do not have to return the validation result for 'bios'
+                # interface.
+                if iface_name == 'bios':
+                    continue
                 iface = getattr(task.driver, iface_name, None)
                 result = reason = None
                 if iface:
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py
index 1dc1df47e..de7c34ad1 100644
--- a/ironic/conductor/utils.py
+++ b/ironic/conductor/utils.py
@@ -34,9 +34,10 @@ CLEANING_INTERFACE_PRIORITY = {
     # by which interface is implementing the clean step. The clean step of the
     # interface with the highest value here, will be executed first in that
     # case.
-    'power': 4,
-    'management': 3,
-    'deploy': 2,
+    'power': 5,
+    'management': 4,
+    'deploy': 3,
+    'bios': 2,
     'raid': 1,
 }