summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-02-12 09:53:17 -0800
committerJohn Wilkins <john.wilkins@inktank.com>2013-02-12 09:53:17 -0800
commit522a81e9d395f0e10a7cf9fd2d31acb3712b8d7c (patch)
tree78385acbe2e6996018e69728c1fecb8d89c41720
parentbd6d4989c91388d0485426836f805aae7aac5158 (diff)
downloadceph-522a81e9d395f0e10a7cf9fd2d31acb3712b8d7c.tar.gz
doc: Added link to <disk> reference. Added minor clarifications.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/rbd/libvirt.rst18
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/rbd/libvirt.rst b/doc/rbd/libvirt.rst
index 31a6b170fd2..2f6c998aca4 100644
--- a/doc/rbd/libvirt.rst
+++ b/doc/rbd/libvirt.rst
@@ -182,8 +182,13 @@ To configure the VM for use with Ceph, perform the following steps:
Replace ``{monitor-host}`` with the name of your host. You may add multiple
``<host>`` entries for your Ceph monitors. The ``dev`` attribute is the
- device name that will appear under the ``/dev`` directory of your VM. The
- ``bus`` attribute may be ``ide`` or ``virtio``.
+ logical device name that will appear under the ``/dev`` directory of your
+ VM. The optional ``bus`` attribute indicates the type of disk device to
+ emulate. The valid settings are driver specific (e.g., "ide", "scsi",
+ "virtio", "xen", "usb" or "sata").
+
+ See `Disks`_ for details of the ``<disk>`` element, and its child elements
+ and attributes.
#. Save the file.
@@ -213,7 +218,7 @@ To configure the VM for use with Ceph, perform the following steps:
You must also set the secret manually by adding the following ``<auth>``
entry to the ``<disk>`` element you entered earlier (replacing the
- ``uuid`` value with the one output from the command line example above). ::
+ ``uuid`` value with the result from the command line example above). ::
sudo virsh edit libvirt-virtual-machine.xml
@@ -230,8 +235,8 @@ To configure the VM for use with Ceph, perform the following steps:
**NOTE:** The username is ``libvirt``, not ``client.libvirt``.
-Once you have configured the VM, you can start it and begin using the Ceph
-block device.
+Once you have configured the VM for use with Ceph, you can start the VM and
+begin using the Ceph block device within your VM.
.. _AutoGen: http://www.gnu.org/software/autogen/
@@ -247,4 +252,5 @@ block device.
.. _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 \ No newline at end of file
+.. _Ceph Authentication: ../../rados/operations/auth-intro
+.. _Disks: http://www.libvirt.org/formatdomain.html#elementsDisks \ No newline at end of file