update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / doc / rbd / iscsi-requirements.rst

diff --git a/ceph/doc/rbd/iscsi-requirements.rst b/ceph/doc/rbd/iscsi-requirements.rst
index 57e42be90e41577626b2d53a1c0853617d3859cc..50dfc2a2740a978ef30b4a75d4e478a4b875c1b1 100644 (file)
--- a/ceph/doc/rbd/iscsi-requirements.rst
+++ b/ceph/doc/rbd/iscsi-requirements.rst
@@ -2,29 +2,26 @@
 iSCSI Gateway Requirements
 ==========================
 
-To implement the Ceph iSCSI gateway there are a few requirements. It is recommended
-to use two to four iSCSI gateway nodes for a highly available Ceph iSCSI gateway
-solution.
+It is recommended to provision two to four iSCSI gateway nodes to
+realize a highly available Ceph iSCSI gateway solution.
 
-For hardware recommendations, see :ref:`hardware-recommendations` for more
-details.
+For hardware recommendations, see :ref:`hardware-recommendations` .
 
 .. note::
-    On the iSCSI gateway nodes, the memory footprint of the RBD images
-    can grow to a large size. Plan memory requirements accordingly based
-    off the number RBD images mapped.
+    On iSCSI gateway nodes the memory footprint is a function of
+    of the RBD images mapped and can grow to be large. Plan memory
+    requirements accordingly based on the number RBD images to be mapped.
 
 There are no specific iSCSI gateway options for the Ceph Monitors or
-OSDs, but it is important to lower the default timers for detecting
-down OSDs to reduce the possibility of initiator timeouts. The following
-configuration options are suggested for each OSD node in the storage
-cluster::
+OSDs, but it is important to lower the default heartbeat interval for
+detecting down OSDs to reduce the possibility of initiator timeouts.
+The following configuration options are suggested::
 
         [osd]
         osd heartbeat grace = 20
         osd heartbeat interval = 5
 
--  Online Updating Using the Ceph Monitor
+-   Updating Running State From a Ceph Monitor Node
 
    ::
 
@@ -32,10 +29,10 @@ cluster::
 
    ::
 
-       ceph tell osd.0 config set osd_heartbeat_grace 20
-       ceph tell osd.0 config set osd_heartbeat_interval 5
+       ceph tell osd.* config set osd_heartbeat_grace 20
+       ceph tell osd.* config set osd_heartbeat_interval 5
 
--  Online Updating on the OSD Node
+-  Updating Running State On Each OSD Node
 
    ::
 
@@ -47,4 +44,8 @@ cluster::
        ceph daemon osd.0 config set osd_heartbeat_interval 5
 
 For more details on setting Ceph's configuration options, see
-:ref:`configuring-ceph`.
+:ref:`configuring-ceph`.  Be sure to persist these settings in
+``/etc/ceph.conf`` or, on Mimic and later releases, in the
+centralized config store.
+
+