Merge "Remove deprecated support for cisco ucs and cims ironic drivers."

doc/source/configure-ironic.rst

@@ -83,8 +83,6 @@ including:
 * agent_ipmitool
 * agent_ipmitool_socat
 * agent_irmc
-* agent_ucs
-* pxe_agent_cimc
 * pxe_drac
 * pxe_drac_inspector
 * pxe_ilo
@@ -92,7 +90,6 @@ including:
 * pxe_ipmitool_socat
 * pxe_irmc
 * pxe_snmp
-* pxe_ucs
 
 .. note::
 

templates/ironic.conf.j2

@@ -30,10 +30,6 @@ enabled_power_interfaces = {{ filtered_ironic_drivers | json_query('[*].power')
 
 [api]
 
-[cimc]
-
-[cisco_ucs]
-
 [conductor]
 {% if ironic_standalone | bool %}
 api_url = {{ ironic_service_internaluri }}/

vars/main.yml

@@ -48,20 +48,6 @@ ironic_driver_types:
     inspect: irmc
     management: irmc
     power: irmc
-  agent_ucs:
-    hardware_type: cisco-ucs-managed
-    boot: pxe
-    deploy: direct
-    inspect: inspector
-    management: ucsm
-    power: ucsm
-  pxe_agent_cimc:
-    hardware_type: cisco-ucs-standalone
-    boot: pxe
-    deploy: direct
-    inspect: inspector
-    management: cimc
-    power: cimc
   pxe_drac:
     hardware_type: idrac
     boot: pxe
@@ -111,13 +97,6 @@ ironic_driver_types:
     inspect: no-inspect
     management: fake
     power: snmp
-  pxe_ucs:
-    hardware_type: cisco-ucs-managed
-    boot: pxe
-    deploy: direct
-    inspect: inspector
-    management: ucsm
-    power: ucsm
 
 ironic_packages_list: >
   {%- set package_list = [] %}