From 4f227e108d40271d5d6b2b1e88659d86cbc6c914 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 11 Oct 2017 12:02:55 -0400 Subject: [PATCH] doc/rbd: tweaks for the LIO iSCSI gateway Fixes: http://tracker.ceph.com/issues/21763 Signed-off-by: Jason Dillaman --- doc/rbd/index.rst | 2 +- doc/rbd/iscsi-initiator-esx.rst | 12 ++++++------ ...ator-rhel.rst => iscsi-initiator-linux.rst} | 16 +++++++--------- doc/rbd/iscsi-initiator-win.rst | 6 +++--- doc/rbd/iscsi-initiators.rst | 13 ++++++++++--- doc/rbd/iscsi-monitoring.rst | 18 ------------------ doc/rbd/iscsi-overview.rst | 2 +- 7 files changed, 28 insertions(+), 41 deletions(-) rename doc/rbd/{iscsi-initiator-rhel.rst => iscsi-initiator-linux.rst} (84%) diff --git a/doc/rbd/index.rst b/doc/rbd/index.rst index c297d0ded2e8a..3cdb7b5be4a74 100644 --- a/doc/rbd/index.rst +++ b/doc/rbd/index.rst @@ -45,7 +45,7 @@ devices simultaneously. Kernel Modules Snapshots Mirroring - iSCSI Gateway + LIO iSCSI Gateway QEMU libvirt Cache Settings diff --git a/doc/rbd/iscsi-initiator-esx.rst b/doc/rbd/iscsi-initiator-esx.rst index 18dd5832289c6..a876f0b48e2a0 100644 --- a/doc/rbd/iscsi-initiator-esx.rst +++ b/doc/rbd/iscsi-initiator-esx.rst @@ -1,10 +1,10 @@ ----------------------------------- -The iSCSI Initiator for VMware ESX ----------------------------------- +------------------------------ +iSCSI Initiator for VMware ESX +------------------------------ **Prerequisite:** -- VMware ESX 6.0 or later +- VMware ESX 6.5 or later **iSCSI Discovery and Multipath Device Setup:** @@ -14,14 +14,14 @@ The iSCSI Initiator for VMware ESX #. In the General tab click the "Advanced" button and in the "Advanced Settings" set RecoveryTimeout to 25. -#. If CHAP was setup on the iSCSI gateway, in the General tab click the "CHAP…​" +#. If CHAP was setup on the iSCSI gateway, in the General tab click the "CHAP..." button. If CHAP is not being used, skip to step 4. #. On the CHAP Credentials windows, select “Do not use CHAP unless required by target”, and enter the "Name" and "Secret" values used on the initial setup for the iSCSI gateway, then click on the "OK" button. -#. On the Dynamic Discovery tab, click the "Add…​" button, and enter the IP address +#. On the Dynamic Discovery tab, click the "Add..." button, and enter the IP address and port of one of the iSCSI target portals. Click on the "OK" button. #. Close the iSCSI Initiator Properties window. A prompt will ask to rescan the diff --git a/doc/rbd/iscsi-initiator-rhel.rst b/doc/rbd/iscsi-initiator-linux.rst similarity index 84% rename from doc/rbd/iscsi-initiator-rhel.rst rename to doc/rbd/iscsi-initiator-linux.rst index 51248e46f7906..386a68fa34048 100644 --- a/doc/rbd/iscsi-initiator-rhel.rst +++ b/doc/rbd/iscsi-initiator-linux.rst @@ -1,14 +1,12 @@ ------------------------------------------------- -The iSCSI Initiator for Red Hat Enterprise Linux ------------------------------------------------- +------------------------- +iSCSI Initiator for Linux +------------------------- **Prerequisite:** -- Package ``iscsi-initiator-utils-6.2.0.873-35`` or newer must be - installed +- Package ``iscsi-initiator-utils`` -- Package ``device-mapper-multipath-0.4.9-99`` or newer must be - installed +- Package ``device-mapper-multipath`` **Installing:** @@ -22,7 +20,7 @@ Install the iSCSI initiator and multipath tools: **Configuring:** #. Create the default ``/etc/multipath.conf`` file and enable the - ``multiapthd`` service: + ``multipathd`` service: :: @@ -42,7 +40,7 @@ Install the iSCSI initiator and multipath tools: path_checker tur prio alua prio_args exclusive_pref_bit - fast_oi_fail_tmo 25 + fast_io_fail_tmo 25 no_path_retry queue } } diff --git a/doc/rbd/iscsi-initiator-win.rst b/doc/rbd/iscsi-initiator-win.rst index 08a1cfbde6f02..c0f023b4180ef 100644 --- a/doc/rbd/iscsi-initiator-win.rst +++ b/doc/rbd/iscsi-initiator-win.rst @@ -1,6 +1,6 @@ ------------------------------------------ -The iSCSI Initiator for Microsoft Windows ------------------------------------------ +------------------------------------- +iSCSI Initiator for Microsoft Windows +------------------------------------- **Prerequisite:** diff --git a/doc/rbd/iscsi-initiators.rst b/doc/rbd/iscsi-initiators.rst index d3ad633480d96..4dc992af94805 100644 --- a/doc/rbd/iscsi-initiators.rst +++ b/doc/rbd/iscsi-initiators.rst @@ -2,9 +2,16 @@ Configuring the iSCSI Initiators -------------------------------- +- `iSCSI Initiator for Linux <../iscsi-initiator-linux>`_ + +- `iSCSI Initiator for Microsoft Windows <../iscsi-initiator-win>`_ + +- `iSCSI Initiator for VMware ESX <../iscsi-initiator-esx>`_ + .. toctree:: :maxdepth: 1 + :hidden: - The iSCSI Initiator for Red Hat Enterprise Linux - The iSCSI Initiator for Microsoft Windows - The iSCSI Initiator for VMware ESX + Linux + Microsoft Windows + VMware ESX diff --git a/doc/rbd/iscsi-monitoring.rst b/doc/rbd/iscsi-monitoring.rst index d425232315358..8a15dd735848e 100644 --- a/doc/rbd/iscsi-monitoring.rst +++ b/doc/rbd/iscsi-monitoring.rst @@ -66,24 +66,6 @@ selects the LIO collector automatically. **Example ``gwtop`` Outputs** -For kernel RBD-based devices: - -:: - - gwtop 2/2 Gateways CPU% MIN: 4 MAX: 5 Network Total In: 2M Out: 3M 10:20:09 - Capacity: 8G Disks: 8 IOPS: 500 Clients: 1 Ceph: HEALTH_OK OSDs: 3 - Pool.Image Src Device Size r/s w/s rMB/s wMB/s await r_await w_await Client - iscsi.t1703 rbd0 500M 0 0 0.00 0.00 0.00 0.00 0.00 - iscsi.testme1 rbd5 500M 0 0 0.00 0.00 0.00 0.00 0.00 - iscsi.testme2 rbd2 500M 0 0 0.00 0.00 0.00 0.00 0.00 - iscsi.testme3 rbd3 500M 0 0 0.00 0.00 0.00 0.00 0.00 - iscsi.testme5 rbd1 500M 0 0 0.00 0.00 0.00 0.00 0.00 - rbd.myhost_1 T rbd4 4G 500 0 1.95 0.00 2.37 2.37 0.00 rh460p(CON) - rbd.test_2 rbd6 1G 0 0 0.00 0.00 0.00 0.00 0.00 - rbd.testme rbd7 500M 0 0 0.00 0.00 0.00 0.00 0.00 - -For user backed storage (TCMU) devices: - :: gwtop 2/2 Gateways CPU% MIN: 4 MAX: 5 Network Total In: 2M Out: 3M 10:20:00 diff --git a/doc/rbd/iscsi-overview.rst b/doc/rbd/iscsi-overview.rst index a8c64e2069d60..9049c21853141 100644 --- a/doc/rbd/iscsi-overview.rst +++ b/doc/rbd/iscsi-overview.rst @@ -46,5 +46,5 @@ Network (SAN). Requirements Configuring the iSCSI Target - Configuring the iSCSI Initiator + Configuring the iSCSI Initiators Monitoring the iSCSI Gateways -- 2.39.5