From 66a081205816225d0863aea7b708e2123cb24324 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Thu, 29 Sep 2016 10:41:57 +0800 Subject: [PATCH] Trivial: Fix some typos in comments and docstring Change-Id: I2b0f76c7458f79e23708c8dd9455239c71cc2f5a --- devstack/lib/ironic | 2 +- doc/source/deploy/api-audit-support.rst | 2 +- doc/source/deploy/metrics.rst | 2 +- doc/source/drivers/oneview.rst | 4 ++-- ironic/api/controllers/v1/node.py | 2 +- ironic/drivers/modules/drac/raid.py | 2 +- ironic/tests/unit/common/test_images.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 77199c2054..45fdcecc30 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -66,7 +66,7 @@ IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64} # The file is composed of multiple lines, each line includes fields # separated by white space, in the format: # -# [] +# [] # # For example: # diff --git a/doc/source/deploy/api-audit-support.rst b/doc/source/deploy/api-audit-support.rst index e2a5c79baa..6005619e20 100644 --- a/doc/source/deploy/api-audit-support.rst +++ b/doc/source/deploy/api-audit-support.rst @@ -17,7 +17,7 @@ Enabling API Audit Logging ========================== Audit middleware is available as part of `keystonemiddleware` (>= 1.6) library. -For infomation regarding how audit middleware functions refer `here. +For information regarding how audit middleware functions refer `here. `_ Auditing can be enabled for the Bare Metal service by making the following changes diff --git a/doc/source/deploy/metrics.rst b/doc/source/deploy/metrics.rst index 51ec950117..b20e45f493 100644 --- a/doc/source/deploy/metrics.rst +++ b/doc/source/deploy/metrics.rst @@ -45,7 +45,7 @@ Enabling metrics in ironic-python-agent --------------------------------------- The ironic-python-agent process receives its configuration in the response from -the inital lookup request to the ironic-api service. This means to configure +the initial lookup request to the ironic-api service. This means to configure ironic-python-agent to emit metrics, you must enable the agent metrics backend in your ironic configuration file on all ironic-conductor hosts:: diff --git a/doc/source/drivers/oneview.rst b/doc/source/drivers/oneview.rst index b881a53eca..16feead2ba 100644 --- a/doc/source/drivers/oneview.rst +++ b/doc/source/drivers/oneview.rst @@ -127,7 +127,7 @@ Configuring and enabling the driver .. note:: An operator can set the ``periodic_check_interval`` option in the [oneview] section to set the interval between running the periodic check. The default - value is 300 seconds (5 minutes). A lower value will reduce the likelyhood + value is 300 seconds (5 minutes). A lower value will reduce the likelihood of races between ironic and OneView at the cost of being more resource intensive. @@ -183,7 +183,7 @@ Configuring and enabling the driver .. note:: An operator can set the ``periodic_check_interval`` option in the [oneview] section to set the interval between running the periodic check. The default - value is 300 seconds (5 minutes). A lower value will reduce the likelyhood + value is 300 seconds (5 minutes). A lower value will reduce the likelihood of races between ironic and OneView at the cost of being more resource intensive. diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py index 5cb2ccce98..670a48f528 100644 --- a/ironic/api/controllers/v1/node.py +++ b/ironic/api/controllers/v1/node.py @@ -142,7 +142,7 @@ def hide_fields_in_newer_versions(obj): def update_state_in_older_versions(obj): - """Change provision state names for API backwards compatability. + """Change provision state names for API backwards compatibility. :param obj: The object being returned to the API client that is to be updated by this method. diff --git a/ironic/drivers/modules/drac/raid.py b/ironic/drivers/modules/drac/raid.py index 8deb640085..a02f562f6f 100644 --- a/ironic/drivers/modules/drac/raid.py +++ b/ironic/drivers/modules/drac/raid.py @@ -643,7 +643,7 @@ def _commit_to_controllers(node, controllers): job_id = commit_config(node, raid_controller=controller, reboot=False) - LOG.info(_LI('Change has been commited to RAID controller ' + LOG.info(_LI('Change has been committed to RAID controller ' '%(controller)s on node %(node)s. ' 'DRAC job id: %(job_id)s'), {'controller': controller, 'node': node.uuid, diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py index 863cb16a42..1fd71211b6 100644 --- a/ironic/tests/unit/common/test_images.py +++ b/ironic/tests/unit/common/test_images.py @@ -744,7 +744,7 @@ class FsImageTestCase(base.TestCase): 'ctx', 'kernel-uuid', 'tmpdir/kernel-uuid') fetch_images_mock.assert_any_call( 'ctx', 'ramdisk-uuid', 'tmpdir/ramdisk-uuid') - # Note (NobodyCam): the orginal assert asserted that fetch_images + # Note (NobodyCam): the original assert asserted that fetch_images # was not called with parameters, this did not # work, So I instead assert that there were only # Two calls to the mock validating the above