Remove CIMC/UCS drivers

Cisco's Third-Party CI was taken down as a result of the CTO's office being restructured. Numerous attempts to re-engage with Cisco directly and address the various known issues in their drivers have not proven to be fruitful. Additionally, the drivers are not Python3 compatible, and some reports have indicated that the CIMC driver is no longer compatible with newer versions. As such, the ironic community has little choice but to to remove the Cisco UCS/CIMC hardware types and driver interface code. Story: 2005033 Task: 29522 Change-Id: Ie12eaf7572ce4d66f6a68025b7fe2d294185ce28
openstack · Jun 26, 2019 · 5f18e52 · 5f18e52
1 parent 7a718ee
commit 5f18e52
Show file tree

Hide file tree

Showing 30 changed files with 0 additions and 2,704 deletions.
diff --git a/doc/source/admin/drivers.rst b/doc/source/admin/drivers.rst
@@ -17,15 +17,13 @@ Hardware Types
 .. toctree::
   :maxdepth: 1
 
-  drivers/cimc
   drivers/ibmc
   drivers/idrac
   drivers/ilo
   drivers/ipmitool
   drivers/irmc
   drivers/redfish
   drivers/snmp
-  drivers/ucs
   drivers/xclarity
 
 Changing Hardware Types and Interfaces

diff --git a/doc/source/admin/drivers/cimc.rst b/doc/source/admin/drivers/cimc.rst
diff --git a/doc/source/admin/drivers/ucs.rst b/doc/source/admin/drivers/ucs.rst
diff --git a/doc/source/admin/upgrade-to-hardware-types.rst b/doc/source/admin/upgrade-to-hardware-types.rst
@@ -22,19 +22,15 @@ agent_ilo             ilo                  ilo-virtual-media    direct
 agent_ipmitool        ipmi                 pxe                  direct          inspector  ipmitool   ipmitool
 agent_ipmitool_socat  ipmi                 pxe                  direct          inspector  ipmitool   ipmitool
 agent_irmc            irmc                 irmc-virtual-media   direct          irmc       irmc       irmc
-agent_ucs             cisco-ucs-managed    pxe                  direct          inspector  ucsm       ucsm
 iscsi_ilo             ilo                  ilo-virtual-media    iscsi           ilo        ilo        ilo
 iscsi_irmc            irmc                 irmc-virtual-media   iscsi           irmc       irmc       irmc
-pxe_agent_cimc        cisco-ucs-standalone pxe                  direct          inspector  cimc       cimc
 pxe_drac              idrac                pxe                  iscsi           idrac      idrac      idrac
 pxe_drac_inspector    idrac                pxe                  iscsi           inspector  idrac      idrac
 pxe_ilo               ilo                  ilo-pxe              iscsi           ilo        ilo        ilo
 pxe_ipmitool          ipmi                 pxe                  iscsi           inspector  ipmitool   ipmitool
 pxe_ipmitool_socat    ipmi                 pxe                  iscsi           inspector  ipmitool   ipmitool
-pxe_iscsi_cimc        cisco-ucs-standalone pxe                  iscsi           inspector  cimc       cimc
 pxe_irmc              irmc                 irmc-pxe             iscsi           irmc       irmc       irmc
 pxe_snmp              snmp                 pxe                  iscsi           no-inspect fake       snmp
-pxe_ucs               cisco-ucs-managed    pxe                  iscsi           inspector  ucsm       ucsm
 ===================== ==================== ==================== ==============  ========== ========== =========
 
 .. note::

diff --git a/driver-requirements.txt b/driver-requirements.txt
@@ -8,13 +8,9 @@ proliantutils>=2.7.0
 pysnmp>=4.3.0,<5.0.0
 python-ironic-inspector-client>=1.5.0
 python-scciclient>=0.8.0
-UcsSdk==0.8.2.2;python_version<'3'
 python-dracclient>=3.0.0,<4.0.0
 python-xclarityclient>=0.1.6
 
-# The CIMC drivers use the Cisco IMC SDK version 0.7.2 or greater
-ImcSdk>=0.7.2
-
 # The Redfish hardware type uses the Sushy library
 sushy>=1.6.0
 

diff --git a/ironic/common/exception.py b/ironic/common/exception.py
@@ -561,25 +561,11 @@ class DirectoryNotWritable(IronicException):
     _msg_fmt = _("Directory %(dir)s is not writable.")
 
 
-class UcsOperationError(DriverOperationError):
-    _msg_fmt = _("Cisco UCS client: operation %(operation)s failed for node"
-                 " %(node)s. Reason: %(error)s")
-
-
-class UcsConnectionError(IronicException):
-    _msg_fmt = _("Cisco UCS client: connection failed for node "
-                 "%(node)s. Reason: %(error)s")
-
-
 class ImageUploadFailed(IronicException):
     _msg_fmt = _("Failed to upload %(image_name)s image to web server "
                  "%(web_server)s, reason: %(reason)s")
 
 
-class CIMCException(DriverOperationError):
-    _msg_fmt = _("Cisco IMC exception occurred for node %(node)s: %(error)s")
-
-
 class NodeTagNotFound(IronicException):
     _msg_fmt = _("Node %(node_id)s doesn't have a tag '%(tag)s'")
 

diff --git a/ironic/conf/__init__.py b/ironic/conf/__init__.py
@@ -20,7 +20,6 @@
 from ironic.conf import api
 from ironic.conf import audit
 from ironic.conf import cinder
-from ironic.conf import cisco
 from ironic.conf import conductor
 from ironic.conf import console
 from ironic.conf import database
@@ -54,7 +53,6 @@
 api.register_opts(CONF)
 audit.register_opts(CONF)
 cinder.register_opts(CONF)
-cisco.register_opts(CONF)
 conductor.register_opts(CONF)
 console.register_opts(CONF)
 database.register_opts(CONF)

diff --git a/ironic/conf/cisco.py b/ironic/conf/cisco.py
diff --git a/ironic/conf/opts.py b/ironic/conf/opts.py
@@ -37,9 +37,7 @@
     ('ansible', ironic.conf.ansible.opts),
     ('api', ironic.conf.api.opts),
     ('audit', ironic.conf.audit.opts),
-    ('cimc', ironic.conf.cisco.cimc_opts),
     ('cinder', ironic.conf.cinder.list_opts()),
-    ('cisco_ucs', ironic.conf.cisco.ucsm_opts),
     ('conductor', ironic.conf.conductor.opts),
     ('console', ironic.conf.console.opts),
     ('database', ironic.conf.database.opts),