X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fdoc%2Frbd%2Fiscsi-initiator-esx.rst;h=41c144dd55bfcc408b7014645dcbf6cb74c574f4;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=18dd5832289c686b70dd46a6e3dec33b04974ddd;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/doc/rbd/iscsi-initiator-esx.rst b/ceph/doc/rbd/iscsi-initiator-esx.rst
index 18dd58322..41c144dd5 100644
--- a/ceph/doc/rbd/iscsi-initiator-esx.rst
+++ b/ceph/doc/rbd/iscsi-initiator-esx.rst
@@ -1,36 +1,105 @@
-----------------------------------
-The iSCSI Initiator for VMware ESX
-----------------------------------
+------------------------------
+iSCSI Initiator for VMware ESX
+------------------------------
 
 **Prerequisite:**
 
--  VMware ESX 6.0 or later
+-  VMware ESX 6.5 or later using Virtual Machine compatibility 6.5 with VMFS 6.
 
 **iSCSI Discovery and Multipath Device Setup:**
 
-#. From vSphere, open the Storage Adapters, on the Configuration tab. Right click
-   on the iSCSI Software Adapter and select Properties.
+The following instructions will use the default vSphere web client and esxcli.
 
-#. In the General tab click the "Advanced" button and in the "Advanced Settings"
-   set RecoveryTimeout to 25.
+#. Enable Software iSCSI
 
-#. 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.
+   .. image:: ../images/esx_web_client_storage_main.png
+      :align: center
 
-#. 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.
+   Click on "Storage" from "Navigator", and select the "Adapters" tab.
+   From there right click "Confgure iSCSI".
 
-#. 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.
+#. Set Initiator Name
 
-#. Close the iSCSI Initiator Properties window. A prompt will ask to rescan the
-   iSCSI software adapter. Select Yes.
+   .. image:: ../images/esx_config_iscsi_main.png
+      :align: center
 
-#. In the Details pane, the LUN on the iSCSI target will be displayed. Right click
-   on a device and select "Manage Paths".
+   If the initiator name in the "Name & alias" section is not the same name
+   used when creating the client during gwcli setup or the initiator name used
+   in the ansible client_connections client variable, then ssh to the ESX
+   host and run the following esxcli commands to change the name.
 
-#. On the Manage Paths window, select “Most Recently Used (VMware)” for the policy
-   path selection. Close and repeat for the other disks.
+   Get the adapter name for Software iSCSI:
+
+   ::
+
+       > esxcli iscsi adapter list
+       > Adapter  Driver     State   UID            Description
+       > -------  ---------  ------  -------------  ----------------------
+       > vmhba64  iscsi_vmk  online  iscsi.vmhba64  iSCSI Software Adapter
+
+   In this example the software iSCSI adapter is vmhba64 and the initiator
+   name is iqn.1994-05.com.redhat:rh7-client:
+
+    ::
+
+        > esxcli iscsi adapter set -A vmhba64 -n iqn.1994-05.com.redhat:rh7-client
+
+#. Setup CHAP
+
+   .. image:: ../images/esx_chap.png
+      :align: center
+
+   Expand the CHAP authentication section, select "Do not use CHAP unless
+   required by target" and enter the CHAP credentials used in the gwcli
+   auth command or ansible client_connections credentials variable.
+
+   The Mutual CHAP authentication section should have "Do not use CHAP"
+   selected.
+
+   Warning: There is a bug in the web client where the requested CHAP
+   settings are not always used initially. On the iSCSI gateway kernel
+   logs you will see the error:
+
+    ::
+
+       > kernel: CHAP user or password not set for Initiator ACL
+       > kernel: Security negotiation failed.
+       > kernel: iSCSI Login negotiation failed.
+
+   To workaround this set the CHAP settings with the esxcli command. Here
+   authname is the username and secret is the password used in previous
+   examples:
+
+   ::
+
+       > esxcli iscsi adapter auth chap set --direction=uni --authname=myiscsiusername --secret=myiscsipassword --level=discouraged -A vmhba64
+
+#. Configure iSCSI Settings
+
+   .. image:: ../images/esx_iscsi_recov_timeout.png
+      :align: center
+
+   Expand Advanced settings and set the "RecoveryTimeout" to 25.
+
+#. Set the discovery address
+
+   .. image:: ../images/esx_config_iscsi_main.png
+      :align: center
+
+   In the Dynamic targets section, click "Add dynamic target" and under
+   Addresses add one of the gateway IP addresses added during the iSCSI
+   gateway setup stage in the gwcli section or an IP set in the ansible
+   gateway_ip_list variable. Only one address needs to be added as the gateways
+   have been setup so all the iSCSI portals are returned during discovery.
+
+   Finally, click the "Save configuration" button. In the Devices tab, you
+   should see the RBD image.
+
+   The LUN should be automatically configured and using the ALUA SATP and
+   MRU PSP. Other SATPs and PSPs must not be used. This can be verified with
+   the esxcli command:
+
+   ::
+
+       > esxcli storage nmp path list -d eui.your_devices_id
 
-Now the disks can be used for datastores.