Merge pull request ceph#13317 from ktdreyer/wip-doc-ms-bind-ipv6-excl…

…usive doc: clarify that "ms bind ipv6" disables IPv4 Reviewed-by: Sage Weil <[email protected]> Reviewed-by: Kefu Chai <[email protected]>
chrisglass · Feb 15, 2017 · df98e8b · df98e8b
2 parents 15dc6c2 + 38c216f
commit df98e8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/doc/install/manual-deployment.rst b/doc/install/manual-deployment.rst
@@ -150,9 +150,9 @@ The procedure is as follows:
 
 	mon host = 192.168.0.1
 
-   **Note:** You may use IPv6 addresses too, but you must set ``ms bind ipv6`` 
-   to ``true``. See `Network Configuration Reference`_ for details about 
-   network configuration.
+   **Note:** You may use IPv6 addresses instead of IPv4 addresses, but
+   you must set ``ms bind ipv6`` to ``true``. See `Network Configuration
+   Reference`_ for details about network configuration.
 
 #. Create a keyring for your cluster and generate a monitor secret key. ::
 

diff --git a/doc/rados/configuration/network-config-ref.rst b/doc/rados/configuration/network-config-ref.rst
@@ -347,7 +347,8 @@ Bind settings set the default port ranges Ceph OSD and MDS daemons use. The
 default range is ``6800:7300``. Ensure that your `IP Tables`_ configuration
 allows you to use the configured port range.
 
-You may also enable Ceph daemons to bind to IPv6 addresses.
+You may also enable Ceph daemons to bind to IPv6 addresses instead of IPv4
+addresses.
 
 
 ``ms bind port min``
@@ -368,7 +369,8 @@ You may also enable Ceph daemons to bind to IPv6 addresses.
 
 ``ms bind ipv6``
 
-:Description: Enables Ceph daemons to bind to IPv6 addresses.
+:Description: Enables Ceph daemons to bind to IPv6 addresses. Currently the
+messenger *either* uses IPv4 or IPv6, but it can't do both.
 :Type: Boolean
 :Default: ``false``
 :Required: No