From 8d02d4aa4c2f0697e8c1baa1c5b4eadd5ccf8d52 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 6 Mar 2018 16:11:03 -0500 Subject: [PATCH 1/3] doc/ceph-volume update stdin as monospaced Signed-off-by: Alfredo Deza --- doc/ceph-volume/lvm/activate.rst | 2 +- doc/ceph-volume/lvm/encryption.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ceph-volume/lvm/activate.rst b/doc/ceph-volume/lvm/activate.rst index 9b7aa43fa45..3990a3d53f3 100644 --- a/doc/ceph-volume/lvm/activate.rst +++ b/doc/ceph-volume/lvm/activate.rst @@ -67,7 +67,7 @@ ensure that the correct device is linked. Existing OSDs ------------- -For exsiting OSDs that have been deployed with different tooling, the only way +For existing OSDs that have been deployed with different tooling, the only way to port them over to the new mechanism is to prepare them again (losing data). See :ref:`ceph-volume-lvm-existing-osds` for details on how to proceed. diff --git a/doc/ceph-volume/lvm/encryption.rst b/doc/ceph-volume/lvm/encryption.rst index 02a447b5779..07207f1aa99 100644 --- a/doc/ceph-volume/lvm/encryption.rst +++ b/doc/ceph-volume/lvm/encryption.rst @@ -38,7 +38,7 @@ volume setups, since encryption will happen once the LV is created. Workflow -------- When setting up the OSD, a secret key will be created, that will be passed -along to the monitor in JSON format as stdin to prevent the key from being +along to the monitor in JSON format as ``stdin`` to prevent the key from being captured in the logs. The JSON payload looks something like:: From f60f93105a61da00ab6f3fe508180dd22fcd322f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 6 Mar 2018 16:11:22 -0500 Subject: [PATCH 2/3] doc/ceph-volume remove duplicate line Signed-off-by: Alfredo Deza --- doc/ceph-volume/lvm/prepare.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/ceph-volume/lvm/prepare.rst b/doc/ceph-volume/lvm/prepare.rst index 9c684c00138..869488fcf25 100644 --- a/doc/ceph-volume/lvm/prepare.rst +++ b/doc/ceph-volume/lvm/prepare.rst @@ -158,9 +158,8 @@ any data** in the OSD):: The command line tool will not contact the monitor to generate an OSD ID and will format the LVM device in addition to storing the metadata on it so that it -can later be startednot contact the monitor to generate an OSD ID and will -format the LVM device in addition to storing the metadata on it so that it can -later be started (for detailed metadata description see :ref:`ceph-volume-lvm-tags`). +can be started later (for detailed metadata description see +:ref:`ceph-volume-lvm-tags`). .. _ceph-volume-lvm-prepare_bluestore: From 97a448b234489d1d61482248094b4f2410fd02b3 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 6 Mar 2018 16:11:47 -0500 Subject: [PATCH 3/3] doc/ceph-volume remove typo in lvm/scan Signed-off-by: Alfredo Deza --- doc/ceph-volume/lvm/scan.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ceph-volume/lvm/scan.rst b/doc/ceph-volume/lvm/scan.rst index 96d2719ac5d..aa9990f7199 100644 --- a/doc/ceph-volume/lvm/scan.rst +++ b/doc/ceph-volume/lvm/scan.rst @@ -3,7 +3,7 @@ scan This sub-command will allow to discover Ceph volumes previously setup by the tool by looking into the system's logical volumes and their tags. -As part of the the :ref:`ceph-volume-lvm-prepare` process, the logical volumes are assigned +As part of the :ref:`ceph-volume-lvm-prepare` process, the logical volumes are assigned a few tags with important pieces of information. .. note:: This sub-command is not yet implemented