Update manual-deployment.rst

- When creating the OSD data, specify osd-uuid so that it matches when the osd is first created.
- Modify caps when adding osd auth to match what ceph-deploy does.

diff --git a/doc/install/manual-deployment.rst b/doc/install/manual-deployment.rst
index 008772a92411b131440276054ca56caae6012ec9..52b73a287eea1c60deacab182f14f7edda332145 100644 (file)
--- a/doc/install/manual-deployment.rst
+++ b/doc/install/manual-deployment.rst
@@ -366,7 +366,7 @@ OSDs with the long form procedure, execute the following on ``node2`` and
 #. Initialize the OSD data directory. :: 
 
        ssh {new-osd-host}
-       sudo ceph-osd -i {osd-num} --mkfs --mkkey
+       sudo ceph-osd -i {osd-num} --mkfs --mkkey --osd-uuid [{uuid}]
        
    The directory must be empty before you can run ``ceph-osd`` with the 
    ``--mkkey`` option. In addition, the ceph-osd tool requires specification
@@ -377,7 +377,7 @@ OSDs with the long form procedure, execute the following on ``node2`` and
    ``ceph-{osd-num}`` in the path is the ``$cluster-$id``.  If your 
    cluster name differs from ``ceph``, use your cluster name instead.::
 
-       sudo ceph auth add osd.{osd-num} osd 'allow *' mon 'allow rwx' -i /var/lib/ceph/osd/ceph-{osd-num}/keyring
+       sudo ceph auth add osd.{osd-num} osd 'allow *' mon 'allow profile osd' -i /var/lib/ceph/osd/ceph-{osd-num}/keyring
 
 
 #. Add your Ceph Node to the CRUSH map. ::