diff --git a/devstack/lib/ironic b/devstack/lib/ironic index c2e748aad0..4e942adba7 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -114,12 +114,6 @@ IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64} # ipmi: # # -# cisco-ucs-standalone: -# -# -# cisco-ucs-managed: -# -# # idrac: # # @@ -298,8 +292,7 @@ fi # are ``ipmi``, ``snmp`` and ``redfish``. # # Additional valid choices if IRONIC_IS_HARDWARE == true are: -# ``cisco-ucs-managed``, ``cisco-ucs-standalone``, ``idrac``, -# and ``irmc``. +# ``idrac`` and ``irmc``. IRONIC_DEPLOY_DRIVER=${IRONIC_DEPLOY_DRIVER:-ipmi} # If the requested driver is not yet enable, enable it, if it is not it will fail anyway @@ -663,16 +656,6 @@ function is_deployed_by_ipmi { return 1 } -function is_deployed_by_cimc { - [[ "${IRONIC_DEPLOY_DRIVER}" == cisco-ucs-standalone ]] && return 0 - return 1 -} - -function is_deployed_by_ucs { - [[ "${IRONIC_DEPLOY_DRIVER}" == cisco-ucs-managed ]] && return 0 - return 1 -} - function is_deployed_by_ilo { [[ "${IRONIC_DEPLOY_DRIVER}" == ilo ]] && return 0 return 1 @@ -2132,17 +2115,6 @@ function enroll_nodes { node_options+=" --driver-info ipmi_address=$bmc_address \ --driver-info ipmi_password=$bmc_passwd \ --driver-info ipmi_username=$bmc_username" - elif is_deployed_by_cimc; then - node_options+=" --driver-info cimc_address=$bmc_address \ - --driver-info cimc_password=$bmc_passwd \ - --driver-info cimc_username=$bmc_username" - elif is_deployed_by_ucs; then - local ucs_service_profile - ucs_service_profile=$(echo $hardware_info |awk '{print $5}') - node_options+=" --driver-info ucs_address=$bmc_address \ - --driver-info ucs_password=$bmc_passwd \ - --driver-info ucs_username=$bmc_username \ - --driver-info ucs_service_profile=$ucs_service_profile" elif is_deployed_by_ilo; then node_options+=" --driver-info ilo_address=$bmc_address \ --driver-info ilo_password=$bmc_passwd \ diff --git a/doc/source/admin/report.txt b/doc/source/admin/report.txt index bd10378b0e..1293047f7a 100644 --- a/doc/source/admin/report.txt +++ b/doc/source/admin/report.txt @@ -125,14 +125,6 @@ audit_middleware_notifications: topics = None transport_url = *** -cimc: - action_interval = 10 - max_retry = 6 - -cisco_ucs: - action_interval = 5 - max_retry = 6 - conductor: api_url = http://10.223.197.220:6385 automated_clean = True diff --git a/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml b/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml new file mode 100644 index 0000000000..a487c3ac90 --- /dev/null +++ b/releasenotes/notes/cisco-drivers-deleted-5a42a8c508704c64.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + The Cisco ``cisco-ucs-managed`` and ``cisco-ucs-standalone`` hardware types + and ``cimc`` and ``ucsm`` hardware interfaces were deprecated in Stein. + They have been removed in Train. + + After upgrading, if any of these hardware types or interfaces are specified + in ironic's configuration options, the ironic-conductor service will fail + to start. Any existing ironic nodes with these hardware types or interfaces + will become inoperational via ironic after the upgrade. If these + hardware types or interfaces are being used, the affected nodes should be + changed to use other hardware types or interfaces; or install these hardware + types (and interfaces) from elsewhere separately. For more information, see + `story 2005033 `_.