From 0f77220df1920bccef8552a51bc1b31851b1fe78 Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 19 May 2020 14:55:09 -0400
Subject: [PATCH] Revert "Deprecate ibmc"

This reverts commit 7e825a28c0a049c38567bb44dc316def562fc25c.

The iBMC module was undeprecated in
66a0533d06913b39bbb50ab6e1d08a16172be2f4, but several of the changes
from the original deprecation were not reverted.

Change-Id: I27a66cc92f320e73a63d2025a50a68f6a3731813
Story: 2007594
Task: 39808
(cherry picked from commit 94af61bc1503732ed9eea9c1506a48a40fa973bf)
---
 doc/source/admin/drivers/ibmc.rst         | 4 ----
 ironic/drivers/modules/ibmc/management.py | 2 --
 ironic/drivers/modules/ibmc/power.py      | 2 --
 ironic/drivers/modules/ibmc/vendor.py     | 2 --
 4 files changed, 10 deletions(-)

diff --git a/doc/source/admin/drivers/ibmc.rst b/doc/source/admin/drivers/ibmc.rst
index c39bf05df7..6ed01f3f79 100644
--- a/doc/source/admin/drivers/ibmc.rst
+++ b/doc/source/admin/drivers/ibmc.rst
@@ -2,10 +2,6 @@
 iBMC driver
 ===============
 
-.. warning::
-   The ``ibmc`` driver has been deprecated due to a lack of a functioning
-   third party CI and will be removed in the Victoria development cycle.
-
 Overview
 ========
 
diff --git a/ironic/drivers/modules/ibmc/management.py b/ironic/drivers/modules/ibmc/management.py
index 3596b391be..672501a7b5 100644
--- a/ironic/drivers/modules/ibmc/management.py
+++ b/ironic/drivers/modules/ibmc/management.py
@@ -34,8 +34,6 @@ LOG = log.getLogger(__name__)
 
 class IBMCManagement(base.ManagementInterface):
 
-    supported = False
-
     def __init__(self):
         """Initialize the iBMC management interface
 
diff --git a/ironic/drivers/modules/ibmc/power.py b/ironic/drivers/modules/ibmc/power.py
index 0750ffa41b..6bb15ee222 100644
--- a/ironic/drivers/modules/ibmc/power.py
+++ b/ironic/drivers/modules/ibmc/power.py
@@ -40,8 +40,6 @@ EXPECT_POWER_STATE_MAP = {
 
 class IBMCPower(base.PowerInterface):
 
-    supported = False
-
     def __init__(self):
         """Initialize the iBMC power interface.
 
diff --git a/ironic/drivers/modules/ibmc/vendor.py b/ironic/drivers/modules/ibmc/vendor.py
index 2d4f74a280..24d497cf72 100644
--- a/ironic/drivers/modules/ibmc/vendor.py
+++ b/ironic/drivers/modules/ibmc/vendor.py
@@ -29,8 +29,6 @@ LOG = log.getLogger(__name__)
 
 class IBMCVendor(base.VendorInterface):
 
-    supported = False
-
     def __init__(self):
         """Initialize the iBMC vendor interface.