doc: Cherry-picked from master to next. Reorders ceph osd create.

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

1 files changed, 14 insertions, 9 deletions

diff --git a/doc/rados/operations/add-or-rm-osds.rst b/doc/rados/operations/add-or-rm-osds.rst
index ce6e0ea45fd..d7d40211c2a 100644
--- a/doc/rados/operations/add-or-rm-osds.rst
+++ b/doc/rados/operations/add-or-rm-osds.rst
@@ -73,6 +73,14 @@ When you add the OSD to the CRUSH map, consider the weight you give to the new
 OSD.  Hard drive capacity grows 40% per year, so newer OSD hosts may have larger
 hard drive than older hosts in the cluster (i.e., they may have greater weight).
 
+
+#. Create the OSD. If no UUID is given, it will be set automatically when the 
+   OSD starts up. The following command will output the OSD number, which you 
+   will need for subsequent steps. ::
+	
+	ceph osd create [{uuid}]
+
+
 #. Create the default directory on your new OSD. :: 
 
 	ssh {new-osd-host}
@@ -98,7 +106,7 @@ hard drive than older hosts in the cluster (i.e., they may have greater weight).
 	
    .. code-block:: ini
 
-     [osd.123]
+     [osd.1]
          host = {hostname}
  
 #. From the host where you keep the master copy of the cluster's 
@@ -107,9 +115,6 @@ hard drive than older hosts in the cluster (i.e., they may have greater weight).
 
 	ssh {new-osd} sudo tee /etc/ceph/ceph.conf < /etc/ceph/ceph.conf
 
-#. Create the OSD. If no UUID is given, it will be set automatically when the OSD starts up. ::
-
-	ceph osd create [{uuid}]
 	
 #. Initialize the OSD data directory. :: 
 
@@ -136,7 +141,7 @@ hard drive than older hosts in the cluster (i.e., they may have greater weight).
 
    For Bobtail (v 0.56), execute the following:: 
 
-	ceph osd crush set {id-or-name} {weight} pool={pool-name}  [{bucket-type}={bucket-name} ...]
+	ceph osd crush set {id-or-name} {weight} root={pool-name}  [{bucket-type}={bucket-name} ...]
 
 
 .. topic:: Argonaut (v0.48) Best Practices
@@ -174,8 +179,8 @@ Adding an OSD (Chef)
 --------------------
 
 This procedure configures your OSD using ``chef-client``. If your host has
-multiple drives, you may need to execute the procedure for preparing an OSD drive
-for each data drive on your host.
+multiple drives, you may need to execute the procedure for preparing an OSD
+drive for each data drive on your host.
 
 When you add the OSD to the CRUSH map, consider the weight you give to the new
 OSD.  Hard drive capacity grows 40% per year, so newer OSD hosts may have larger
@@ -326,7 +331,7 @@ OSD for each drive by repeating this procedure.
 
 	ceph osd rm {osd-num}
 	#for example
-	ceph osd rm 123
+	ceph osd rm 1
 	
 #. Navigate to the host where you keep the master copy of the cluster's 
    ``ceph.conf`` file. ::
@@ -337,7 +342,7 @@ OSD for each drive by repeating this procedure.
 
 #. Remove the OSD entry from your ``ceph.conf`` file. ::
 
-	[osd.123]
+	[osd.1]
 		host = {hostname}
  
 #. From the host where you keep the master copy of the cluster's ``ceph.conf`` file,