openstack/ironic
Code Issues Proposed changes

Merge "Correct typos in doc files"

Browse Source
This commit is contained in:
Jenkins 2017-03-10 15:56:41 +00:00 committed by Gerrit Code Review
commit dd10f2e44f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,8 @@ Currently there are 3 iLO drivers:
The ``iscsi_ilo`` and ``agent_ilo`` drivers provide security enhanced
PXE-less deployment by using iLO virtual media to boot up the bare metal node.
These drivers send management info through management channel and separates
it from data channel which is used for deployment.
These drivers send management info through the management channel and separate
it from the data channel which is used for deployment.
``iscsi_ilo`` and ``agent_ilo`` drivers use deployment ramdisk
built from ``diskimage-builder``. The ``iscsi_ilo`` driver deploys from
@ -40,7 +40,7 @@ Prerequisites
=============
* `proliantutils <https://pypi.python.org/pypi/proliantutils>`_ is a python package
which contains set of modules for managing HPE ProLiant hardware.
which contains a set of modules for managing HPE ProLiant hardware.
Install ``proliantutils`` module on the ironic conductor node. Minimum
version required is 2.2.0::
@ -148,7 +148,7 @@ Web server configuration on conductor
``use_web_server_for_images``: If the variable is set to ``false``, ``iscsi_ilo``
and ``agent_ilo`` uses swift containers to host the intermediate floppy
image and the boot ISO. If the variable is set to ``true``, these drivers
uses the local web server for hosting the intermediate files. The default value
use the local web server for hosting the intermediate files. The default value
for ``use_web_server_for_images`` is False.
``http_url``: The value for this variable is prefixed with the generated
@ -201,7 +201,7 @@ PXE or iPXE.
Target Users
~~~~~~~~~~~~
* Users who do not want to use PXE/TFTP protocol on their data centres.
* Users who do not want to use PXE/TFTP protocol in their data centers.
* Users who have concerns with PXE protocol's security issues and want to have a
security enhanced PXE-less deployment mechanism.

8
doc/source/drivers/ipa.rst
View File

@ -88,7 +88,7 @@ Steps to enable proxies
download. You can think of it as roughly the time needed for IPA ramdisk to
startup and begin download. This value is used to check if the swift
temporary URL duration is large enough to let the image download begin. Also
if temporary URL caching is enabled this will determine if a cached entry
if temporary URL caching is enabled, this will determine if a cached entry
will still be valid when the download starts. It is used only if
``[glance]swift_temp_url_cache_enabled`` is ``True``.
@ -108,10 +108,10 @@ Steps to enable proxies
Advanced configuration
======================
Out-of-band Vs. in-band power off on deploy
Out-of-band vs. in-band power off on deploy
-------------------------------------------
After deploying an image onto the node's hard disk Ironic will reboot
After deploying an image onto the node's hard disk, Ironic will reboot
the machine into the new image. By default this power action happens
``in-band``, meaning that the ironic-conductor will instruct the IPA
ramdisk to power itself off.
@ -119,7 +119,7 @@ ramdisk to power itself off.
Some hardware may have a problem with the default approach and
would require Ironic to talk directly to the management controller
to switch the power off and on again. In order to tell Ironic to do
that you have to update the node's ``driver_info`` field and set the
that, you have to update the node's ``driver_info`` field and set the
``deploy_forces_oob_reboot`` parameter with the value of **True**. For
example, the below command sets this configuration in a specific node::

8
doc/source/drivers/oneview.rst
View File

@ -347,9 +347,9 @@ result, there are different steps to perform if the node has an instance
provisioned, in other words, when the `provisioning_state` is set to `active`.
.. note::
Verify if the node has not already been migrated checking if there is
a `dynamic_allocation` field set to ``True`` in the `driver_info` namespace
doing::
Verify if the node has not already been migrated by checking if there is
a `dynamic_allocation` field set to ``True`` in the `driver_info`
namespace by doing::
$ ironic node-show --fields driver_info
@ -437,7 +437,7 @@ ironic-oneviewd
^^^^^^^^^^^^^^^
The ``ironic-oneviewd`` daemon monitors the ironic inventory of resources and
providing facilities to operators managing OneView driver deployments. The
provides facilities to operators managing OneView driver deployments. The
daemon supports both allocation models (dynamic and pre-allocation) as of
version 0.1.0.