doc: Added modification to quick start.

fixes: #6682

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

diff --git a/doc/start/quick-start-preflight.rst b/doc/start/quick-start-preflight.rst
index 328a7cd346c3ae275cce43bb4253727937d687cb..1e822edcafa5fbf158764a1566aa5daf831c7578 100644 (file)
--- a/doc/start/quick-start-preflight.rst
+++ b/doc/start/quick-start-preflight.rst
@@ -8,87 +8,35 @@ Thank you for trying Ceph! We recommend setting up a ``ceph-deploy`` admin node
 and a 3-node :term:`Ceph Storage Cluster` to explore the basics of Ceph. This
 **Preflight Checklist** will help you prepare a ``ceph-deploy`` admin node and
 three Ceph Nodes (or virtual machines) that will host your Ceph Storage Cluster.
+Before proceeding any further, see `OS Recommendations`_ to verify that you have
+a supported distribution and version of Linux.
 
 
 .. ditaa:: 
            /------------------\         /----------------\
-           |    Admin Node    |         |   ceph–node1   |
+           |    Admin Node    |         |     node1      |
            |                  +-------->+                |
            |    ceph–deploy   |         | cCCC           |
            \---------+--------/         \----------------/
                      |
                      |                  /----------------\
-                     |                  |   ceph–node2   |
+                     |                  |     node2      |
                      +----------------->+                |
                      |                  | cCCC           |
                      |                  \----------------/
                      |
                      |                  /----------------\
-                     |                  |   ceph–node3   |
+                     |                  |     node3      |
                      +----------------->|                |
                                         | cCCC           |
                                         \----------------/
 
 
-Ceph Node Setup
-===============
-
-Perform the following steps:
-
-#. Create a user on each Ceph Node. :: 
-
-       ssh user@ceph-server
-       sudo useradd -d /home/ceph -m ceph
-       sudo passwd ceph
-
-#. Add ``root`` privileges for the user on each Ceph Node. :: 
-
-       echo "ceph ALL = (root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/ceph
-       sudo chmod 0440 /etc/sudoers.d/ceph
-
-
-#. Install an SSH server (if necessary):: 
-
-       sudo apt-get install openssh-server
-       sudo yum install openssh-server
-       
-       
-#. Configure your ``ceph-deploy`` admin node with password-less SSH access to
-   each Ceph Node. Leave the passphrase empty::
-
-       ssh-keygen
-       Generating public/private key pair.
-       Enter file in which to save the key (/ceph-client/.ssh/id_rsa):
-       Enter passphrase (empty for no passphrase):
-       Enter same passphrase again:
-       Your identification has been saved in /ceph-client/.ssh/id_rsa.
-       Your public key has been saved in /ceph-client/.ssh/id_rsa.pub.
-
-#. Copy the key to each Ceph Node. ::
-
-       ssh-copy-id ceph@ceph-server
-
-
-#. Modify the ``~/.ssh/config`` file of your ``ceph-deploy`` admin node so that
-   it logs in to Ceph Nodes as the user you created (e.g., ``ceph``). ::
-
-       Host ceph-server
-          Hostname ceph-server.fqdn-or-ip-address.com
-          User ceph
-
-
-#. Ensure connectivity using ``ping`` with short hostnames (``hostname -s``). 
-   Address hostname resolution issues and firewall issues as necessary. 
-   **Note:** Hostnames should resolve to a network IP address, not to the 
-   loopback IP address (e.g., hostnames should resolve to an IP address other 
-   than 127.0.0.1).
-
-
 Ceph Deploy Setup
 =================
 
 Add Ceph repositories to the ``ceph-deploy`` admin node. Then, install
-``ceph-deploy``.
+``ceph-deploy``. 
 
 .. important:: Do not call ``ceph-deploy`` with ``sudo`` or run it as ``root`` 
    if you are logged in as a different user, because it will not issue ``sudo`` 
@@ -148,6 +96,78 @@ following steps:
        sudo yum update && sudo yum install ceph-deploy
 
 
+
+Ceph Node Setup
+===============
+
+If you are using ``ceph-deploy`` version 1.1.3 and beyond, ``ceph-deploy``
+will attempt to create the SSH key and copy it to the initial monitor nodes 
+automatically when you create the new cluster. For example:: 
+
+       ceph-deploy new node1
+
+For other Ceph Nodes (and for initial monitors prior to ``ceph-deploy`` v1.1.3)
+perform the following steps:
+
+#. Create a user on each Ceph Node. :: 
+
+       ssh user@ceph-server
+       sudo useradd -d /home/ceph -m ceph
+       sudo passwd ceph
+
+#. Add ``root`` privileges for the user on each Ceph Node. :: 
+
+       echo "ceph ALL = (root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/ceph
+       sudo chmod 0440 /etc/sudoers.d/ceph
+
+
+#. Install an SSH server (if necessary) on each Ceph Node:: 
+
+       sudo apt-get install openssh-server
+       sudo yum install openssh-server
+       
+       
+#. Configure your ``ceph-deploy`` admin node with password-less SSH access to
+   each Ceph Node. When configuring SSH access, do not use ``sudo`` or the 
+   ``root`` user. Leave the passphrase empty::
+
+       ssh-keygen
+       Generating public/private key pair.
+       Enter file in which to save the key (/ceph-client/.ssh/id_rsa):
+       Enter passphrase (empty for no passphrase):
+       Enter same passphrase again:
+       Your identification has been saved in /ceph-client/.ssh/id_rsa.
+       Your public key has been saved in /ceph-client/.ssh/id_rsa.pub.
+
+#. Copy the key to each Ceph Node. ::
+
+       ssh-copy-id ceph@node1
+       ssh-copy-id ceph@node2
+       ssh-copy-id ceph@node3
+
+
+#. Modify the ``~/.ssh/config`` file of your ``ceph-deploy`` admin node so that
+   it logs in to Ceph Nodes as the user you created (e.g., ``ceph``). ::
+
+       Host node1
+          Hostname node1
+          User ceph
+       Host node2
+          Hostname node2
+          User ceph
+       Host node3
+          Hostname node3
+          User ceph
+
+
+#. Ensure connectivity using ``ping`` with hostnames (i.e., not IP addresses). 
+   Address hostname resolution issues and firewall issues as necessary.
+
+.. note:: If you use your admin node as one of the Ceph Nodes, you must perform
+   these steps on the admin node too.
+
+
+
 Summary
 =======
 
@@ -155,4 +175,4 @@ This completes the Quick Start Preflight. Proceed to the `Storage Cluster
 Quick Start`_.
 
 .. _Storage Cluster Quick Start: ../quick-ceph-deploy
-.. _OS Recommendations: ../../install/os-recommendations
+.. _OS Recommendations: ../os-recommendations