From 0f6c0cd2e43f60999901de8e4b167b27a393d950 Mon Sep 17 00:00:00 2001 From: Rajesh Tailor Date: Mon, 30 May 2022 17:24:07 +0530 Subject: [PATCH] Fix typos in help messages This change fixes typos in conf parameter help messages and in error log message. Change-Id: Iedc268072d77771b208603e663b0ce9b94215eb8 (cherry picked from commit aa1e7a6933df221e72a1371d286a63a9a08ce90a) --- nova/compute/resource_tracker.py | 2 +- nova/conf/compute.py | 2 +- nova/conf/hyperv.py | 2 +- nova/conf/libvirt.py | 4 ++-- nova/conf/neutron.py | 2 +- nova/conf/quota.py | 2 +- nova/conf/scheduler.py | 4 ++-- nova/tests/unit/compute/test_resource_tracker.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 8497bbcd899c..0b801f7ddf99 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -1856,7 +1856,7 @@ class ResourceTracker(object): raise ValueError(_( "Provider config '%(source_file_name)s' attempts " "to define a trait that is owned by the " - "virt driver or specified via the placment api. " + "virt driver or specified via the placement api. " "Invalid traits '%(invalid)s' must be removed " "from '%(source_file_name)s'.") % { 'source_file_name': source_file_name, diff --git a/nova/conf/compute.py b/nova/conf/compute.py index 263d77758695..5abe7694f80b 100644 --- a/nova/conf/compute.py +++ b/nova/conf/compute.py @@ -200,7 +200,7 @@ The template will be rendered using Jinja2 template engine, and receive a top-level key called ``interfaces``. This key will contain a list of dictionaries, one for each interface. -Refer to the cloudinit documentaion for more information: +Refer to the cloudinit documentation for more information: https://cloudinit.readthedocs.io/en/latest/topics/datasources.html diff --git a/nova/conf/hyperv.py b/nova/conf/hyperv.py index caa7a8702b8d..cce3cdc3e2dc 100644 --- a/nova/conf/hyperv.py +++ b/nova/conf/hyperv.py @@ -320,7 +320,7 @@ configured to claim such devices. cfg.ListOpt('iscsi_initiator_list', default=[], help=""" -List of iSCSI initiators that will be used for estabilishing iSCSI sessions. +List of iSCSI initiators that will be used for establishing iSCSI sessions. If none are specified, the Microsoft iSCSI initiator service will choose the initiator. diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 7d9c837ba569..4ea37b8fe97f 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -453,7 +453,7 @@ support built into QEMU. Prerequisite: TLS environment is configured correctly on all relevant Compute nodes. This means, Certificate Authority (CA), server, client -certificates, their corresponding keys, and their file permisssions are +certificates, their corresponding keys, and their file permissions are in place, and are validated. Notes: @@ -705,7 +705,7 @@ the source of entropy on the host. Since libvirt 1.3.4, any path (that returns random numbers when read) is accepted. The recommended source of entropy is ``/dev/urandom`` -- it is non-blocking, therefore relatively fast; and avoids the limitations of ``/dev/random``, which is -a legacy interface. For more details (and comparision between different +a legacy interface. For more details (and comparison between different RNG sources), refer to the "Usage" section in the Linux kernel API documentation for ``[u]random``: http://man7.org/linux/man-pages/man4/urandom.4.html and diff --git a/nova/conf/neutron.py b/nova/conf/neutron.py index dc391a268e89..e6774ced55ab 100644 --- a/nova/conf/neutron.py +++ b/nova/conf/neutron.py @@ -46,7 +46,7 @@ Default name for the floating IP pool. Specifies the name of floating IP pool used for allocating floating IPs. This option is only used if Neutron does not specify the floating IP pool name in -port binding reponses. +port binding responses. """), cfg.IntOpt('extension_sync_interval', default=600, diff --git a/nova/conf/quota.py b/nova/conf/quota.py index 0d51129d5038..e5b4b8dc7381 100644 --- a/nova/conf/quota.py +++ b/nova/conf/quota.py @@ -147,7 +147,7 @@ Possible values: deprecated_group='DEFAULT', deprecated_name='quota_server_groups', help=""" -The maxiumum number of server groups per project. +The maximum number of server groups per project. Server groups are used to control the affinity and anti-affinity scheduling policy for a group of servers or instances. Reducing the quota will not affect diff --git a/nova/conf/scheduler.py b/nova/conf/scheduler.py index 8b3b61698738..03e78fe70172 100644 --- a/nova/conf/scheduler.py +++ b/nova/conf/scheduler.py @@ -780,7 +780,7 @@ follows: Possible values: -* An integer or float value, where the value corresponds to the multipler +* An integer or float value, where the value corresponds to the multiplier ratio for this weigher. Related options: @@ -857,7 +857,7 @@ of any actual metric value: Possible values: -* An integer or float value, where the value corresponds to the multipler +* An integer or float value, where the value corresponds to the multiplier ratio for this weigher. Related options: diff --git a/nova/tests/unit/compute/test_resource_tracker.py b/nova/tests/unit/compute/test_resource_tracker.py index 36236d58dede..caa12cb754c7 100644 --- a/nova/tests/unit/compute/test_resource_tracker.py +++ b/nova/tests/unit/compute/test_resource_tracker.py @@ -4069,7 +4069,7 @@ class ProviderConfigTestCases(BaseTestCase): expected = ("Provider config 'test_provider_config.yaml' attempts to " "define a trait that is owned by the virt driver or " - "specified via the placment api. Invalid traits '" + + "specified via the placement api. Invalid traits '" + ex_trait + "' must be removed from " "'test_provider_config.yaml'.")