From e812e9748241510dfa7c85575fa8916b5863899b Mon Sep 17 00:00:00 2001
From: LiuNanke <nanke.liu@easystack.cn>
Date: Fri, 20 Nov 2015 00:21:52 +0800
Subject: [PATCH] Fix some typos by toolkit typo

There commands:
 $pip install topy
 $cd rally
 $topy -a rally

Change-Id: I40ac3b34b97743edf5edc0a17b9553bb2f3476e2
---
 doc/feature_request/capture_task_logging.rst                  | 2 +-
 .../plugins/openstack/context/manila/manila_share_networks.py | 2 +-
 rally/plugins/openstack/scenarios/ceilometer/utils.py         | 2 +-
 rally/plugins/openstack/scenarios/cinder/volumes.py           | 2 +-
 rally/plugins/openstack/scenarios/neutron/utils.py            | 2 +-
 rally/plugins/openstack/scenarios/nova/servers.py             | 2 +-
 rally/plugins/openstack/scenarios/sahara/clusters.py          | 4 ++--
 rally/plugins/openstack/scenarios/vm/vmtasks.py               | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/feature_request/capture_task_logging.rst b/doc/feature_request/capture_task_logging.rst
index 556d00fb..506a053f 100644
--- a/doc/feature_request/capture_task_logging.rst
+++ b/doc/feature_request/capture_task_logging.rst
@@ -13,7 +13,7 @@ well as test results.
 Problem description
 -------------------
 
-In case of errors it is quite hard to debug what happend.
+In case of errors it is quite hard to debug what happened.
 
 
 Possible solution
diff --git a/rally/plugins/openstack/context/manila/manila_share_networks.py b/rally/plugins/openstack/context/manila/manila_share_networks.py
index f1fab5c0..aa372ecf 100644
--- a/rally/plugins/openstack/context/manila/manila_share_networks.py
+++ b/rally/plugins/openstack/context/manila/manila_share_networks.py
@@ -54,7 +54,7 @@ class ManilaShareNetworks(context.Context):
             # ]
             # Also, make sure that all 'existing users' in appropriate
             # registered deployment have share networks if its usage is
-            # enbaled, else Rally will randomly take users that does not
+            # enabled, else Rally will randomly take users that does not
             # satisfy criteria.
             "share_networks": {"type": "object"},
         },
diff --git a/rally/plugins/openstack/scenarios/ceilometer/utils.py b/rally/plugins/openstack/scenarios/ceilometer/utils.py
index 1739c8d6..9839c67a 100644
--- a/rally/plugins/openstack/scenarios/ceilometer/utils.py
+++ b/rally/plugins/openstack/scenarios/ceilometer/utils.py
@@ -70,7 +70,7 @@ class CeilometerScenario(scenario.OpenStackScenario):
                 now - datetime.timedelta(seconds=(interval * i))
             ).isoformat()
             if metadata_list:
-                # NOTE(idegtiarov): Adding more then one template of metadata
+                # NOTE(idegtiarov): Adding more than one template of metadata
                 # required it's proportional distribution among whole samples.
                 sample_item["resource_metadata"] = metadata_list[
                     i * len_meta // count
diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally/plugins/openstack/scenarios/cinder/volumes.py
index 630017c6..0c1d7b18 100644
--- a/rally/plugins/openstack/scenarios/cinder/volumes.py
+++ b/rally/plugins/openstack/scenarios/cinder/volumes.py
@@ -311,7 +311,7 @@ class CinderVolumes(cinder_utils.CinderScenario,
 
         """Create volume, snapshot and attach/detach volume.
 
-        This scenario is based off of the standalone qaStressTest.py
+        This scenario is based on the standalone qaStressTest.py
         (https://github.com/WaltHP/cinder-stress).
 
         :param volume_type: Whether or not to specify volume type when creating
diff --git a/rally/plugins/openstack/scenarios/neutron/utils.py b/rally/plugins/openstack/scenarios/neutron/utils.py
index 9768de01..ae264acf 100644
--- a/rally/plugins/openstack/scenarios/neutron/utils.py
+++ b/rally/plugins/openstack/scenarios/neutron/utils.py
@@ -53,7 +53,7 @@ class NeutronScenario(scenario.OpenStackScenario):
 
         :param resource: A neutron resource object dict describing the
                          resource that the name is being set for. In
-                         particular, this must have have a single key
+                         particular, this must have a single key
                          that is the resource type, and a single value
                          that is itself a dict including the "id" key.
         :param kwargs: The keyword arg dict that the user supplied,
diff --git a/rally/plugins/openstack/scenarios/nova/servers.py b/rally/plugins/openstack/scenarios/nova/servers.py
index 5bc77a16..910273a3 100644
--- a/rally/plugins/openstack/scenarios/nova/servers.py
+++ b/rally/plugins/openstack/scenarios/nova/servers.py
@@ -326,7 +326,7 @@ class NovaServers(utils.NovaScenario,
 
         A rescue will be issued on the given server upon which time
         this method will wait for the server to become 'RESCUE'.
-        Once the server is RESCUE a unrescue will be issued and
+        Once the server is RESCUE an unrescue will be issued and
         this method will wait for the server to become 'ACTIVE'
         again.
 
diff --git a/rally/plugins/openstack/scenarios/sahara/clusters.py b/rally/plugins/openstack/scenarios/sahara/clusters.py
index 4b33f439..24547763 100644
--- a/rally/plugins/openstack/scenarios/sahara/clusters.py
+++ b/rally/plugins/openstack/scenarios/sahara/clusters.py
@@ -57,7 +57,7 @@ class SaharaClusters(utils.SaharaScenario):
         :param floating_ip_pool: floating ip pool name from which Floating
                                  IPs will be allocated. Sahara will determine
                                  automatically how to treat this depending on
-                                 it's own configurations. Defaults to None
+                                 its own configurations. Defaults to None
                                  because in some cases Sahara may work w/o
                                  Floating IPs.
         :param volumes_per_node: number of Cinder volumes that will be
@@ -135,7 +135,7 @@ class SaharaClusters(utils.SaharaScenario):
         :param floating_ip_pool: floating ip pool name from which Floating
                                  IPs will be allocated. Sahara will determine
                                  automatically how to treat this depending on
-                                 it's own configurations. Defaults to None
+                                 its own configurations. Defaults to None
                                  because in some cases Sahara may work w/o
                                  Floating IPs.
         :param neutron_net_id: id of a Neutron network that will be used
diff --git a/rally/plugins/openstack/scenarios/vm/vmtasks.py b/rally/plugins/openstack/scenarios/vm/vmtasks.py
index 94dea1fb..879b7551 100644
--- a/rally/plugins/openstack/scenarios/vm/vmtasks.py
+++ b/rally/plugins/openstack/scenarios/vm/vmtasks.py
@@ -126,7 +126,7 @@ class VMTasks(vm_utils.VMScenario):
                     "interpreter": ["NAME=Earth", "/bin/sh"]
                 }
 
-                # Run an inline script sending it to a uploaded remote
+                # Run an inline script sending it to an uploaded remote
                 # interpreter
                 command = {
                     "script_inline": "echo \"Hello, ${NAME:-World}\"",