ceph-volume: fix typos

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a4ece9cae60c437b7e01db21c9c42363865c295c)

diff --git a/src/ceph-volume/ceph_volume/api/lvm.py b/src/ceph-volume/ceph_volume/api/lvm.py
index 5a9fd97a091cb8ca212393db19439248fc09bdd5..d5df10b3c01c573ebd5574003235f6ea7ddba105 100644 (file)
--- a/src/ceph-volume/ceph_volume/api/lvm.py
+++ b/src/ceph-volume/ceph_volume/api/lvm.py
@@ -40,7 +40,7 @@ def _output_parser(output, fields):
         if not line:
             continue
 
-        # spliting on ';' because that is what the lvm call uses as
+        # splitting on ';' because that is what the lvm call uses as
         # '--separator'
         output_items = [i.strip() for i in line.split(';')]
         # map the output to the fiels
@@ -945,7 +945,7 @@ class PVolumes(list):
                 if matches:
                     tag_filtered.append(pvolume)
             # return the tag_filtered pvolumes here, the `filtered` list is no
-            # longer useable
+            # longer usable
             return tag_filtered
 
         return filtered

diff --git a/src/ceph-volume/ceph_volume/decorators.py b/src/ceph-volume/ceph_volume/decorators.py
index d0be938172f99d912a6f71870bd1f46ae5e211e8..f6777281795b26a8622f21d9c54054150363d48e 100644 (file)
--- a/src/ceph-volume/ceph_volume/decorators.py
+++ b/src/ceph-volume/ceph_volume/decorators.py
@@ -41,7 +41,7 @@ def catches(catch=None, handler=None, exit=True):
             some_call()
             print "Success!"
 
-    If multiple exceptions need to be catched they need to be provided as a
+    If multiple exceptions need to be caught they need to be provided as a
     tuple::
 
         @catches((TypeError, AttributeError))

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 2ff5a094365956dbc9e598136dbeb0f13f877fda..d46db9edfa5866aa4632134940cdbde02267ca0e 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -32,7 +32,7 @@ def activate_filestore(lvs, no_systemd=False):
     # blow up with a KeyError if this doesn't exist
     osd_fsid = osd_lv.tags['ceph.osd_fsid']
     if not osd_journal_lv:
-        # must be a disk partition, by quering blkid by the uuid we are ensuring that the
+        # must be a disk partition, by querying blkid by the uuid we are ensuring that the
         # device path is always correct
         journal_uuid = osd_lv.tags['ceph.journal_uuid']
         osd_journal = disk.get_device_from_partuuid(journal_uuid)

diff --git a/src/ceph-volume/ceph_volume/devices/simple/scan.py b/src/ceph-volume/ceph_volume/devices/simple/scan.py
index df3ff2bca493e8bd261521ddf27676ac0ede61c4..c920248265813140e66bdf810267955b5e740369 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/simple/scan.py
+++ b/src/ceph-volume/ceph_volume/devices/simple/scan.py
@@ -271,7 +271,7 @@ class Scan(object):
                 )
             )
             terminal.success(
-                'To take over managment of this scanned OSD, and disable ceph-disk and udev, run:'
+                'To take over management of this scanned OSD, and disable ceph-disk and udev, run:'
             )
             terminal.success('    ceph-volume simple activate %s %s' % (osd_id, osd_fsid))
 

diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py
index 2d382606ba2152514bbe2ca6e7af4d28f6e5ccf8..fbf30050c8c988c45ec39e1b1cd5c60af586949e 100644 (file)
--- a/src/ceph-volume/ceph_volume/util/disk.py
+++ b/src/ceph-volume/ceph_volume/util/disk.py
@@ -570,7 +570,7 @@ class Size(object):
 
         for k, v in kw.items():
             self._convert(v, k)
-            # only pursue the first occurence
+            # only pursue the first occurrence
             break
 
     def _convert(self, size, unit):

diff --git a/src/ceph-volume/ceph_volume/util/encryption.py b/src/ceph-volume/ceph_volume/util/encryption.py
index df7eb69d860455d2beb33b5f3653722f7c9cb369..72a0ccf121e9722f77df4897e30a135ceb9754c9 100644 (file)
--- a/src/ceph-volume/ceph_volume/util/encryption.py
+++ b/src/ceph-volume/ceph_volume/util/encryption.py
@@ -152,7 +152,7 @@ def write_lockbox_keyring(osd_id, osd_fsid, secret):
     For filestore: The path for the OSD would exist at this point even if no
     OSD data device is mounted, so the keyring is written to fetch the key, and
     then the data device is mounted on that directory, making the keyring
-    "dissapear".
+    "disappear".
     """
     if os.path.exists('/var/lib/ceph/osd/%s-%s/lockbox.keyring' % (conf.cluster, osd_id)):
         return

diff --git a/src/ceph-volume/ceph_volume/util/prepare.py b/src/ceph-volume/ceph_volume/util/prepare.py
index e39bbb37ba95a4abdb207e90e89672ac78019971..027b4c081842bf29d78316ac1c31ba0b78f798e9 100644 (file)
--- a/src/ceph-volume/ceph_volume/util/prepare.py
+++ b/src/ceph-volume/ceph_volume/util/prepare.py
@@ -385,7 +385,7 @@ def osd_mkfs_bluestore(osd_id, fsid, keyring=None, wal=False, db=False):
                    --setuser ceph --setgroup ceph
 
     In some cases it is required to use the keyring, when it is passed in as
-    a keywork argument it is used as part of the ceph-osd command
+    a keyword argument it is used as part of the ceph-osd command
     """
     path = '/var/lib/ceph/osd/%s-%s/' % (conf.cluster, osd_id)
     monmap = os.path.join(path, 'activate.monmap')