From: Dan Mick Date: Tue, 17 Apr 2018 01:35:33 +0000 (-0700) Subject: Spelling/typos X-Git-Tag: v12.2.5~1^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a95c75e0dd8280f8870b6778a047c0a0ffadd334;p=ceph.git Spelling/typos Signed-off-by: Dan Mick (cherry picked from commit 15ef400bb35e70cbb27144d595759d31a075aa37) --- diff --git a/src/ceph-volume/ceph_volume/api/lvm.py b/src/ceph-volume/ceph_volume/api/lvm.py index e9dbb0b2288..7d249666593 100644 --- a/src/ceph-volume/ceph_volume/api/lvm.py +++ b/src/ceph-volume/ceph_volume/api/lvm.py @@ -172,7 +172,7 @@ def get_api_vgs(): Return the list of group volumes available in the system using flags to include common metadata associated with them - Command and sample delimeted output, should look like:: + Command and sample delimited output should look like:: $ vgs --noheadings --readonly --separator=';' \ -o vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free @@ -192,7 +192,7 @@ def get_api_lvs(): Return the list of logical volumes available in the system using flags to include common metadata associated with them - Command and delimeted output, should look like:: + Command and delimited output should look like:: $ lvs --noheadings --readonly --separator=';' -o lv_tags,lv_path,lv_name,vg_name ;/dev/ubuntubox-vg/root;root;ubuntubox-vg @@ -213,7 +213,7 @@ def get_api_pvs(): This will only return physical volumes set up to work with LVM. - Command and delimeted output, should look like:: + Command and delimited output should look like:: $ pvs --noheadings --readonly --separator=';' -o pv_name,pv_tags,pv_uuid /dev/sda1;; @@ -542,7 +542,7 @@ class Volumes(list): def _purge(self): """ - Deplete all the items in the list, used internally only so that we can + Delete all the items in the list, used internally only so that we can dynamically allocate the items when filtering without the concern of messing up the contents """ diff --git a/src/ceph-volume/ceph_volume/process.py b/src/ceph-volume/ceph_volume/process.py index 4bedb134f8d..9eece12419f 100644 --- a/src/ceph-volume/ceph_volume/process.py +++ b/src/ceph-volume/ceph_volume/process.py @@ -61,7 +61,7 @@ def log_descriptors(reads, process, terminal_logging): def obfuscate(command_, on=None): """ Certain commands that are useful to log might contain information that - should be replaced by '*' like when creating OSDs and the keyryings are + should be replaced by '*' like when creating OSDs and the keyrings are being passed, which should not be logged. :param on: A string (will match a flag) or an integer (will match an index) diff --git a/src/ceph-volume/ceph_volume/systemd/systemctl.py b/src/ceph-volume/ceph_volume/systemd/systemctl.py index ab78456e6c2..688433774f1 100644 --- a/src/ceph-volume/ceph_volume/systemd/systemctl.py +++ b/src/ceph-volume/ceph_volume/systemd/systemctl.py @@ -60,7 +60,7 @@ def mask_ceph_disk(): # systemctl allows using a glob like '*' for masking, but there was a bug # in that it wouldn't allow this for service templates. This means that # masking ceph-disk@* will not work, so we must link the service directly. - # /etc/systemd takes precendence regardless of the location of the unit + # /etc/systemd takes precedence regardless of the location of the unit process.run( ['ln', '-sf', '/dev/null', '/etc/systemd/system/ceph-disk@.service'] )