openstack/ironic
Code Issues Proposed changes

Merge "Update iLO documentation for clean step 'reset_ilo'"

Browse Source
This commit is contained in:
Jenkins 2016-03-07 11:57:34 +00:00 committed by Gerrit Code Review
commit 43fb12402b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/drivers/ilo.rst
View File

@ -721,8 +721,6 @@ Supported **Automated** Cleaning Operations
* The automated cleaning operations supported are: * The automated cleaning operations supported are:
-``reset_ilo``:
Resets the iLO. By default, enabled with priority 1.
-``reset_bios_to_default``: -``reset_bios_to_default``:
Resets system ROM settings to default. By default, enabled with priority Resets system ROM settings to default. By default, enabled with priority
10. This clean step is supported only on Gen9 and above servers. 10. This clean step is supported only on Gen9 and above servers.
@ -735,6 +733,8 @@ Supported **Automated** Cleaning Operations
-``clear_secure_boot_keys``: -``clear_secure_boot_keys``:
Clears all secure boot keys. This step is supported only on Gen9 and above Clears all secure boot keys. This step is supported only on Gen9 and above
servers. By default, this step is disabled. servers. By default, this step is disabled.
-``reset_ilo``:
Resets the iLO. By default, this step is disabled.
* For in-band cleaning operations supported by ``agent_ilo`` driver, see * For in-band cleaning operations supported by ``agent_ilo`` driver, see
:ref:`InbandvsOutOfBandCleaning`. :ref:`InbandvsOutOfBandCleaning`.
@ -750,7 +750,7 @@ Supported **Automated** Cleaning Operations
* Configuration Options for the automated clean steps are listed under * Configuration Options for the automated clean steps are listed under
``[ilo]`` section in ironic.conf :: ``[ilo]`` section in ironic.conf ::
- clean_priority_reset_ilo=1 - clean_priority_reset_ilo=0
- clean_priority_reset_bios_to_default=10 - clean_priority_reset_bios_to_default=10
- clean_priority_reset_secure_boot_keys_to_default=20 - clean_priority_reset_secure_boot_keys_to_default=20
- clean_priority_clear_secure_boot_keys=0 - clean_priority_clear_secure_boot_keys=0