]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
doc/rbd: tweaks for the LIO iSCSI gateway 18250/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 11 Oct 2017 16:02:55 +0000 (12:02 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 19 Oct 2017 13:40:22 +0000 (09:40 -0400)
Fixes: http://tracker.ceph.com/issues/21763
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
doc/rbd/index.rst
doc/rbd/iscsi-initiator-esx.rst
doc/rbd/iscsi-initiator-linux.rst [new file with mode: 0644]
doc/rbd/iscsi-initiator-rhel.rst [deleted file]
doc/rbd/iscsi-initiator-win.rst
doc/rbd/iscsi-initiators.rst
doc/rbd/iscsi-monitoring.rst
doc/rbd/iscsi-overview.rst

index c297d0ded2e8ad42ceda7a568722b37fa06d07d7..3cdb7b5be4a749b2e1f940edc4894fc096c32683 100644 (file)
@@ -45,7 +45,7 @@ devices simultaneously.
        Kernel Modules <rbd-ko>
        Snapshots<rbd-snapshot>
        Mirroring <rbd-mirroring>
-       iSCSI Gateway <iscsi-overview>
+       LIO iSCSI Gateway <iscsi-overview>
        QEMU <qemu-rbd>
        libvirt <libvirt>
        Cache Settings <rbd-config-ref/>
index 18dd5832289c686b70dd46a6e3dec33b04974ddd..a876f0b48e2a0f6bffe024581427c4eee807548e 100644 (file)
@@ -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-linux.rst b/doc/rbd/iscsi-initiator-linux.rst
new file mode 100644 (file)
index 0000000..386a68f
--- /dev/null
@@ -0,0 +1,88 @@
+-------------------------
+iSCSI Initiator for Linux
+-------------------------
+
+**Prerequisite:**
+
+-  Package ``iscsi-initiator-utils``
+
+-  Package ``device-mapper-multipath``
+
+**Installing:**
+
+Install the iSCSI initiator and multipath tools:
+
+   ::
+
+       # yum install iscsi-initiator-utils
+       # yum install device-mapper-multipath
+
+**Configuring:**
+
+#. Create the default ``/etc/multipath.conf`` file and enable the
+   ``multipathd`` service:
+
+   ::
+
+       # mpathconf --enable --with_multipathd y
+
+#. Add the following to ``/etc/multipath.conf`` file:
+
+   ::
+
+       devices {
+               device {
+                       vendor                 "LIO-ORG"
+                       hardware_handler       "1 alua"
+                       path_grouping_policy   "failover"
+                       path_selector          "queue-length 0"
+                       failback               60
+                       path_checker           tur
+                       prio                   alua
+                       prio_args              exclusive_pref_bit
+                       fast_io_fail_tmo       25
+                       no_path_retry          queue
+               }
+       }
+
+#. Restart the ``multipathd`` service:
+
+   ::
+
+       # systemctl reload multipathd
+
+**iSCSI Discovery and Setup:**
+
+#. Discover the target portals:
+
+   ::
+
+       # iscsiadm -m discovery -t -st 192.168.56.101
+       192.168.56.101:3260,1 iqn.2003-01.org.linux-iscsi.rheln1
+       192.168.56.102:3260,2 iqn.2003-01.org.linux-iscsi.rheln1
+
+#. Login to target:
+
+   ::
+
+       # iscsiadm -m node -T iqn.2003-01.org.linux-iscsi.rheln1 -l
+
+**Multipath IO Setup:**
+
+The multipath daemon (``multipathd``), will set up devices automatically
+based on the ``multipath.conf`` settings. Running the ``multipath``
+command show devices setup in a failover configuration with a priority
+group for each path.
+
+::
+
+    # multipath -ll
+    mpathbt (360014059ca317516a69465c883a29603) dm-1 LIO-ORG ,IBLOCK
+    size=1.0G features='0' hwhandler='1 alua' wp=rw
+    |-+- policy='queue-length 0' prio=50 status=active
+    | `- 28:0:0:1 sde  8:64  active ready running
+    `-+- policy='queue-length 0' prio=10 status=enabled
+      `- 29:0:0:1 sdc  8:32  active ready running
+
+You should now be able to use the RBD image like you would a normal
+multipath’d iSCSI disk.
diff --git a/doc/rbd/iscsi-initiator-rhel.rst b/doc/rbd/iscsi-initiator-rhel.rst
deleted file mode 100644 (file)
index 51248e4..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-------------------------------------------------
-The iSCSI Initiator for Red Hat Enterprise Linux
-------------------------------------------------
-
-**Prerequisite:**
-
--  Package ``iscsi-initiator-utils-6.2.0.873-35`` or newer must be
-   installed
-
--  Package ``device-mapper-multipath-0.4.9-99`` or newer must be
-   installed
-
-**Installing:**
-
-Install the iSCSI initiator and multipath tools:
-
-   ::
-
-       # yum install iscsi-initiator-utils
-       # yum install device-mapper-multipath
-
-**Configuring:**
-
-#. Create the default ``/etc/multipath.conf`` file and enable the
-   ``multiapthd`` service:
-
-   ::
-
-       # mpathconf --enable --with_multipathd y
-
-#. Add the following to ``/etc/multipath.conf`` file:
-
-   ::
-
-       devices {
-               device {
-                       vendor                 "LIO-ORG"
-                       hardware_handler       "1 alua"
-                       path_grouping_policy   "failover"
-                       path_selector          "queue-length 0"
-                       failback               60
-                       path_checker           tur
-                       prio                   alua
-                       prio_args              exclusive_pref_bit
-                       fast_oi_fail_tmo       25
-                       no_path_retry          queue
-               }
-       }
-
-#. Restart the ``multipathd`` service:
-
-   ::
-
-       # systemctl reload multipathd
-
-**iSCSI Discovery and Setup:**
-
-#. Discover the target portals:
-
-   ::
-
-       # iscsiadm -m discovery -t -st 192.168.56.101
-       192.168.56.101:3260,1 iqn.2003-01.org.linux-iscsi.rheln1
-       192.168.56.102:3260,2 iqn.2003-01.org.linux-iscsi.rheln1
-
-#. Login to target:
-
-   ::
-
-       # iscsiadm -m node -T iqn.2003-01.org.linux-iscsi.rheln1 -l
-
-**Multipath IO Setup:**
-
-The multipath daemon (``multipathd``), will set up devices automatically
-based on the ``multipath.conf`` settings. Running the ``multipath``
-command show devices setup in a failover configuration with a priority
-group for each path.
-
-::
-
-    # multipath -ll
-    mpathbt (360014059ca317516a69465c883a29603) dm-1 LIO-ORG ,IBLOCK
-    size=1.0G features='0' hwhandler='1 alua' wp=rw
-    |-+- policy='queue-length 0' prio=50 status=active
-    | `- 28:0:0:1 sde  8:64  active ready running
-    `-+- policy='queue-length 0' prio=10 status=enabled
-      `- 29:0:0:1 sdc  8:32  active ready running
-
-You should now be able to use the RBD image like you would a normal
-multipath’d iSCSI disk.
index 08a1cfbde6f02fff8799aebfe7557bbdd8b905ea..c0f023b4180ef0c371317e46d3c6f769a3bd5715 100644 (file)
@@ -1,6 +1,6 @@
------------------------------------------
-The iSCSI Initiator for Microsoft Windows
------------------------------------------
+-------------------------------------
+iSCSI Initiator for Microsoft Windows
+-------------------------------------
 
 **Prerequisite:**
 
index d3ad633480d964b133b4987737e0ca43b11c53bd..4dc992af94805d3d341fda9924ee17eb1d911fdc 100644 (file)
@@ -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 <iscsi-initiator-rhel>
-  The iSCSI Initiator for Microsoft Windows <iscsi-initiator-win>
-  The iSCSI Initiator for VMware ESX <iscsi-initiator-esx>
+  Linux <iscsi-initiator-linux>
+  Microsoft Windows <iscsi-initiator-win>
+  VMware ESX <iscsi-initiator-esx>
index d4252323153588456dffbae8915aa6af4eb8fa3a..8a15dd735848e61a256642f03acf3b377fa3c6cf 100644 (file)
@@ -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
index a8c64e2069d60df5a730d2ff13cfce803e2c6396..9049c21853141d689bc57db7cf3b66b0daee8fab 100644 (file)
@@ -46,5 +46,5 @@ Network (SAN).
 
   Requirements <iscsi-requirements>
   Configuring the iSCSI Target <iscsi-targets>
-  Configuring the iSCSI Initiator <iscsi-initiators>
+  Configuring the iSCSI Initiators <iscsi-initiators>
   Monitoring the iSCSI Gateways <iscsi-monitoring>