From: John Wilkins <john.wilkins@inktank.com>
Date: Mon, 8 Sep 2014 21:04:33 +0000 (-0700)
Subject: doc: Fixed broken links and clarified terms for new authentication docs.
X-Git-Tag: v0.86~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5777c421548e7f039bb2c77cb0df2e9c7404723;p=ceph.git

doc: Fixed broken links and clarified terms for new authentication docs.

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

diff --git a/doc/rbd/libvirt.rst b/doc/rbd/libvirt.rst
index 40d507f464f5..262e64ed8c96 100644
--- a/doc/rbd/libvirt.rst
+++ b/doc/rbd/libvirt.rst
@@ -67,9 +67,9 @@ To configure Ceph for use with ``libvirt``, perform the following steps:
 
 	ceph osd lspools
 
-#. `Create a Ceph Name`_ (or use ``client.admin`` for version 0.9.7 and earlier).
-   The following example uses the Ceph name ``client.libvirt`` and references
-   ``libvirt-pool``. ::
+#. `Create a Ceph User`_ (or use ``client.admin`` for version 0.9.7 and 
+   earlier). The following example uses the Ceph user name ``client.libvirt`` 
+   and references ``libvirt-pool``. ::
 
 	ceph auth get-or-create client.libvirt mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=libvirt-pool'
 	
@@ -78,8 +78,9 @@ To configure Ceph for use with ``libvirt``, perform the following steps:
 	ceph auth list
 
    **NOTE**: ``libvirt`` will access Ceph using the ID ``libvirt``, 
-   not the Ceph name ``client.libvirt``. See `Cephx Commandline`_ for detailed
-   explanation of the difference between ID and name.	
+   not the Ceph name ``client.libvirt``. See `User Management - User`_ and 
+   `User Management - CLI`_ for a detailed explanation of the difference 
+   between ID and name.	
 
 #. Use QEMU to `create an image`_ in your RBD pool. 
    The following example uses the image name ``new-libvirt-image``
@@ -206,7 +207,8 @@ commands, refer to `Virsh Command Reference`_.
 	
 #. Save the file.
 
-#. If you are using `Ceph Authentication`_, you must generate a secret. :: 
+#. If your Ceph Storage Cluster has `Ceph Authentication`_ enabled (it does by 
+   default), you must generate a secret. :: 
 
 	cat > secret.xml <<EOF
 	<secret ephemeral='no' private='no'>
@@ -289,12 +291,13 @@ within your VM.
 .. _Block Devices and OpenStack: ../rbd-openstack
 .. _Block Devices and CloudStack: ../rbd-cloudstack
 .. _Create a pool: ../../rados/operations/pools#create-a-pool
-.. _Create a Ceph Name: ../../rados/operations/authentication#add-a-key
+.. _Create a Ceph User: ../../rados/operations/user-management#add-a-user
 .. _create an image: ../qemu-rbd#creating-images-with-qemu
 .. _Virsh Command Reference: http://www.libvirt.org/virshcmdref.html
 .. _KVM/VirtManager: https://help.ubuntu.com/community/KVM/VirtManager
-.. _Ceph Authentication: ../../rados/operations/auth-intro
+.. _Ceph Authentication: ../../rados/configuration/auth-config-ref
 .. _Disks: http://www.libvirt.org/formatdomain.html#elementsDisks
 .. _rbd create: ../rados-rbd-cmds#creating-a-block-device-image
-.. _Cephx Commandline: ../../rados/operations/authentication#cephx-commandline-options
+.. _User Management - User: ../../rados/operations/user-management#user
+.. _User Management - CLI: ../../rados/operations/user-management#command-line-usage
 .. _Virtio: http://www.linux-kvm.org/page/Virtio
\ No newline at end of file