Merge "Support iRMC hardware type again"

5 files changed, 0 insertions, 14 deletions

diff --git a/ironic/drivers/modules/irmc/bios.py b/ironic/drivers/modules/irmc/bios.py
index 8bf3a026d..55201b5d1 100644
--- a/ironic/drivers/modules/irmc/bios.py
+++ b/ironic/drivers/modules/irmc/bios.py
@@ -34,8 +34,6 @@ METRICS = metrics_utils.get_metrics_logger(__name__)
 
 class IRMCBIOS(base.BIOSInterface):
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface."""
         return irmc_common.COMMON_PROPERTIES
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py
index f36df670a..815254843 100644
--- a/ironic/drivers/modules/irmc/boot.py
+++ b/ironic/drivers/modules/irmc/boot.py
@@ -580,8 +580,6 @@ class IRMCVolumeBootMixIn(object):
     used by VIOM (Virtual I/O Manager) library of SCCI client.
     """
 
-    supported = False
-
     def _validate_volume_boot(self, task):
         """Validate information for volume boot with this interface.
 
@@ -900,8 +898,6 @@ class IRMCVolumeBootMixIn(object):
 class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
     """iRMC Virtual Media boot-related actions."""
 
-    supported = False
-
     capabilities = ['iscsi_volume_boot', 'fibre_channel_volume_boot']
 
     def __init__(self):
@@ -1105,8 +1101,6 @@ class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
 class IRMCPXEBoot(pxe.PXEBoot):
     """iRMC PXE boot."""
 
-    supported = False
-
     @METRICS.timer('IRMCPXEBoot.prepare_ramdisk')
     def prepare_ramdisk(self, task, ramdisk_params):
         """Prepares the boot of Ironic ramdisk using PXE.
diff --git a/ironic/drivers/modules/irmc/inspect.py b/ironic/drivers/modules/irmc/inspect.py
index 87b8fb928..5d438a6c8 100644
--- a/ironic/drivers/modules/irmc/inspect.py
+++ b/ironic/drivers/modules/irmc/inspect.py
@@ -197,8 +197,6 @@ def _inspect_hardware(node, existing_traits=None, **kwargs):
 class IRMCInspect(base.InspectInterface):
     """Interface for out of band inspection."""
 
-    supported = False
-
     def __init__(self):
         """Validate the driver-specific inspection information.
 
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index 3adea8ce7..fbadffb5e 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -208,8 +208,6 @@ def _set_power_state(task, target_state, timeout=None):
 class IRMCPower(base.PowerInterface):
     """Interface for power-related actions."""
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface.
 
diff --git a/ironic/drivers/modules/irmc/raid.py b/ironic/drivers/modules/irmc/raid.py
index 55c268fb1..901695632 100644
--- a/ironic/drivers/modules/irmc/raid.py
+++ b/ironic/drivers/modules/irmc/raid.py
@@ -339,8 +339,6 @@ def _validate_physical_disks(node, logical_disks):
 
 class IRMCRAID(base.RAIDInterface):
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface."""
         return irmc_common.COMMON_PROPERTIES