Merge "Fix typos in help messages"

Author: Zuul

nova/compute/resource_tracker.py

@@ -1856,7 +1856,7 @@ def _merge_provider_configs(self, provider_configs, provider_tree):
                         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,

nova/conf/compute.py

@@ -200,7 +200,7 @@
 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
 

nova/conf/hyperv.py

@@ -320,7 +320,7 @@
     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.

nova/conf/libvirt.py

@@ -453,7 +453,7 @@
 
 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 @@
 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

nova/conf/neutron.py

@@ -46,7 +46,7 @@
 
 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,

nova/conf/quota.py

@@ -147,7 +147,7 @@
         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

nova/conf/scheduler.py

@@ -780,7 +780,7 @@
 
 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 @@
 
 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:

nova/tests/unit/compute/test_resource_tracker.py

@@ -4069,7 +4069,7 @@ def test_merge_provider_configs_additional_traits_exception(self):
 
         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'.")