Merge "Enables event subscription methods for ilo and ilo5 hardware types"

2 files changed, 21 insertions, 0 deletions

diff --git a/doc/source/admin/drivers/ilo.rst b/doc/source/admin/drivers/ilo.rst
index f764a6d89..56f102287 100644
--- a/doc/source/admin/drivers/ilo.rst
+++ b/doc/source/admin/drivers/ilo.rst
@@ -65,6 +65,7 @@ The hardware type ``ilo`` supports following HPE server features:
 * `BIOS configuration support`_
 * `IPv6 support`_
 * `Layer 3 or DHCP-less ramdisk booting`_
+* `Events subscription`_
 
 Apart from above features hardware type ``ilo5`` also supports following
 features:
@@ -200,6 +201,18 @@ The ``ilo`` hardware type supports following hardware interfaces:
         enabled_hardware_types = ilo
         enabled_rescue_interfaces = agent,no-rescue
 
+* vendor
+    Supports ``ilo``, ``ilo-redfish`` and ``no-vendor``. The default is
+    ``ilo``. They can be enabled by using the
+    ``[DEFAULT]enabled_vendor_interfaces`` option in ``ironic.conf`` as given
+    below:
+
+    .. code-block:: ini
+
+        [DEFAULT]
+        enabled_hardware_types = ilo
+        enabled_vendor_interfaces = ilo,ilo-redfish,no-vendor
+
 
 The ``ilo5`` hardware type supports all the ``ilo`` interfaces described above,
 except for ``boot`` and ``raid`` interfaces. The details of ``boot`` and
@@ -2136,6 +2149,12 @@ DHCP-less deploy is supported by ``ilo`` and ``ilo5`` hardware types.
 However it would work only with ilo-virtual-media boot interface. See
 :doc:`/admin/dhcp-less` for more information.
 
+Events subscription
+^^^^^^^^^^^^^^^^^^^
+Events subscription is supported by ``ilo`` and ``ilo5`` hardware types with
+``ilo`` vendor interface for Gen10 and Gen10 Plus servers. See
+:ref:`node-vendor-passthru-methods` for more information.
+
 .. _`ssacli documentation`: https://support.hpe.com/hpsc/doc/public/display?docId=c03909334
 .. _`proliant-tools`: https://docs.openstack.org/diskimage-builder/latest/elements/proliant-tools/README.html
 .. _`HPE iLO4 User Guide`: https://h20566.www2.hpe.com/hpsc/doc/public/display?docId=c03334051
diff --git a/doc/source/admin/drivers/redfish.rst b/doc/source/admin/drivers/redfish.rst
index 899ef98a2..eb1f561f4 100644
--- a/doc/source/admin/drivers/redfish.rst
+++ b/doc/source/admin/drivers/redfish.rst
@@ -543,6 +543,8 @@ settings. The following fields will be returned in the BIOS API
     "``unique``", "The setting is specific to this node"
     "``reset_required``", "After changing this setting a node reboot is required"
 
+.. _node-vendor-passthru-methods:
+
 Node Vendor Passthru Methods
 ============================