openstack/ironic
Code Issues Proposed changes

Merge "fix typos in documentation"

Browse Source
This commit is contained in:
Zuul 2018-03-27 02:13:43 +00:00 committed by Gerrit Code Review
commit e8f276b9ab
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/install/refarch/common.rst
View File

@ -175,7 +175,7 @@ configuration file, for example:
[deploy] [deploy]
default_boot_option = local default_boot_option = local
This default can be overriden by setting the ``boot_option`` capability on a This default can be overridden by setting the ``boot_option`` capability on a
node. See :ref:`local-boot-partition-images` for details. node. See :ref:`local-boot-partition-images` for details.
.. note:: .. note::

12
ironic/conf/ansible.py
View File

@ -92,7 +92,7 @@ opts = [
cfg.StrOpt('default_username', cfg.StrOpt('default_username',
default='ansible', default='ansible',
help=_("Name of the user to use for Ansible when connecting " help=_("Name of the user to use for Ansible when connecting "
"to the ramdisk over SSH. It may be overriden " "to the ramdisk over SSH. It may be overridden "
"by per-node 'ansible_username' option " "by per-node 'ansible_username' option "
"in node's 'driver_info' field.")), "in node's 'driver_info' field.")),
cfg.StrOpt('default_key_file', cfg.StrOpt('default_key_file',
@ -101,14 +101,14 @@ opts = [
"over SSH. Default is to use default SSH keys " "over SSH. Default is to use default SSH keys "
"configured for the user running the ironic-conductor " "configured for the user running the ironic-conductor "
"service. Private keys with password must be pre-loaded " "service. Private keys with password must be pre-loaded "
"into 'ssh-agent'. It may be overriden by per-node " "into 'ssh-agent'. It may be overridden by per-node "
"'ansible_key_file' option in node's " "'ansible_key_file' option in node's "
"'driver_info' field.")), "'driver_info' field.")),
cfg.StrOpt('default_deploy_playbook', cfg.StrOpt('default_deploy_playbook',
default='deploy.yaml', default='deploy.yaml',
help=_("Path (relative to $playbooks_path or absolute) " help=_("Path (relative to $playbooks_path or absolute) "
"to the default playbook used for deployment. " "to the default playbook used for deployment. "
"It may be overriden by per-node " "It may be overridden by per-node "
"'ansible_deploy_playbook' option in node's " "'ansible_deploy_playbook' option in node's "
"'driver_info' field.")), "'driver_info' field.")),
cfg.StrOpt('default_shutdown_playbook', cfg.StrOpt('default_shutdown_playbook',
@ -116,14 +116,14 @@ opts = [
help=_("Path (relative to $playbooks_path or absolute) " help=_("Path (relative to $playbooks_path or absolute) "
"to the default playbook used for graceful in-band " "to the default playbook used for graceful in-band "
"shutdown of the node. " "shutdown of the node. "
"It may be overriden by per-node " "It may be overridden by per-node "
"'ansible_shutdown_playbook' option in node's " "'ansible_shutdown_playbook' option in node's "
"'driver_info' field.")), "'driver_info' field.")),
cfg.StrOpt('default_clean_playbook', cfg.StrOpt('default_clean_playbook',
default='clean.yaml', default='clean.yaml',
help=_("Path (relative to $playbooks_path or absolute) " help=_("Path (relative to $playbooks_path or absolute) "
"to the default playbook used for node cleaning. " "to the default playbook used for node cleaning. "
"It may be overriden by per-node " "It may be overridden by per-node "
"'ansible_clean_playbook' option in node's " "'ansible_clean_playbook' option in node's "
"'driver_info' field.")), "'driver_info' field.")),
cfg.StrOpt('default_clean_steps_config', cfg.StrOpt('default_clean_steps_config',
@ -131,7 +131,7 @@ opts = [
help=_("Path (relative to $playbooks_path or absolute) " help=_("Path (relative to $playbooks_path or absolute) "
"to the default auxiliary cleaning steps file used " "to the default auxiliary cleaning steps file used "
"during the node cleaning. " "during the node cleaning. "
"It may be overriden by per-node " "It may be overridden by per-node "
"'ansible_clean_steps_config' option in node's " "'ansible_clean_steps_config' option in node's "
"'driver_info' field.")), "'driver_info' field.")),
] ]