Merge https://github.com/openstack/ironic:master (29a9468) into main

devstack/lib/ironic

@@ -155,9 +155,6 @@ IRONIC_NODE_SHARD_NAME=${IRONIC_NODE_SHARD_NAME:-ds_shard_1}
 # idrac:
 #   <BMC address> <MAC address> <BMC username> <BMC password>
 #
-# irmc:
-#   <BMC address> <MAC address> <BMC username> <BMC password>
-#
 IRONIC_HWINFO_FILE=${IRONIC_HWINFO_FILE:-$IRONIC_DATA_DIR/hardware_info}
 
 # Set up defaults for functional / integration testing
@@ -345,7 +342,7 @@ fi
 # are ``ipmi``, ``snmp`` and ``redfish``.
 #
 # Additional valid choices if IRONIC_IS_HARDWARE == true are:
-# ``idrac`` and ``irmc``.
+# ``idrac``.
 IRONIC_DEPLOY_DRIVER=${IRONIC_DEPLOY_DRIVER:-ipmi}
 
 # If present, these files are used as deploy ramdisk/kernel.
@@ -1008,11 +1005,6 @@ function is_deployed_by_redfish {
     return 1
 }
 
-function is_deployed_by_irmc {
-    [[ "$IRONIC_DEPLOY_DRIVER" == irmc ]] && return 0
-    return 1
-}
-
 function is_drac_enabled {
     [[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*idrac*}" ]] && return 0
     return 1
@@ -1338,9 +1330,6 @@ function install_ironic {
         pip_install python-dracclient
     fi
 
-    if is_irmc_enabled; then
-        pip_install python-scciclient pysnmp
-    fi
 
     if is_ansible_deploy_enabled; then
         pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')"
@@ -3479,13 +3468,6 @@ function enroll_nodes {
                     --driver-info redfish_password=$bmc_passwd \
                     --driver-info redfish_username=$bmc_username \
                     --driver-info redfish_verify_ca=False"
-            elif is_deployed_by_irmc; then
-                node_options+=" --driver-info irmc_address=$bmc_address \
-                    --driver-info irmc_password=$bmc_passwd \
-                    --driver-info irmc_username=$bmc_username"
-                if [[ -n "$IRONIC_DEPLOY_ISO_ID" ]]; then
-                    node_options+=" --driver-info deploy_iso=$IRONIC_DEPLOY_ISO_ID"
-                fi
             fi
 
             interface_info="${mac_address}"

doc/source/admin/boot-from-volume.rst

@@ -24,9 +24,9 @@ the node OR the iPXE boot templates such that the node CAN be booted.
 .. figure:: ./../images/boot-from-volume.svg
    :width: 100%
 
-In this example, the boot interface does the heavy lifting. For drivers the
-``irmc`` and ``ilo`` hardware types with hardware type-specific boot
-interfaces, they are able to signal via an out-of-band mechanism to the
+In this example, the boot interface does the heavy lifting. For the
+``ilo`` hardware type with its hardware type-specific boot
+interface, it is able to signal via an out-of-band mechanism to the
 baremetal node's BMC that the integrated iSCSI initiators are to connect
 to the supplied volume target information.
 

doc/source/admin/cleaning.rst

@@ -378,6 +378,18 @@ An example is setting the BMC clock using the Redfish management interface::
     }]
   }
 
+If ``target_datetime`` is omitted, Ironic uses the current UTC time on the
+conductor when the step executes. This makes the step suitable for automated
+cleaning runbooks without hardcoding a timestamp::
+
+  {
+    "target": "clean",
+    "clean_steps": [{
+      "interface": "management",
+      "step": "set_bmc_clock"
+    }]
+  }
+
 This step requires the node to use the ``redfish`` management interface
 and that the Redfish service exposes the ``DateTime`` and ``DateTimeLocalOffset``
 fields under the Manager Resource.

doc/source/admin/console.rst

@@ -54,7 +54,7 @@ Node serial console
 -------------------
 
 Serial consoles for nodes are implemented using `socat`_. It is supported by
-the ``ipmi``, ``irmc``, and ``redfish`` hardware types.
+the ``ipmi`` and ``redfish`` hardware types.
 
 .. NOTE::
    The use of the ``ipmitool-socat`` console interface on any hardware type

doc/source/admin/drivers.rst

@@ -28,7 +28,6 @@ Hardware Types
   drivers/ilo
   drivers/intel-ipmi
   drivers/ipmitool
-  drivers/irmc
   drivers/redfish
   drivers/snmp
   drivers/fake