doc: Improvements to qemu installation.

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

diff --git a/doc/install/install-vm-cloud.rst b/doc/install/install-vm-cloud.rst
index 1c54814ddc0bd4741a11aed056b383632074b67f..45d4c9f4c3307fccdd1727fccef8876731101876 100644 (file)
--- a/doc/install/install-vm-cloud.rst
+++ b/doc/install/install-vm-cloud.rst
@@ -57,30 +57,21 @@ To install QEMU, execute the following:
        [main]
        enabled = 1
 
-#. Create a ``/etc/yum.repos.d/ceph-qemu.conf`` file with the following 
+#. Create a ``/etc/yum.repos.d/ceph-extras.repo`` file with the following 
    contents, and replace ``{distro}`` with your Linux distribution. Follow
    the ``baseurl`` path below to see which distributions Ceph supports:: 
 
-       [ceph-qemu]
-       name=Ceph Packages for QEMU
+       [ceph-extras]
+       name=Ceph Extras
        baseurl=http://ceph.com/packages/ceph-extras/rpm/{distro}/$basearch
        enabled=1
        priority=2
        gpgcheck=1
        type=rpm-md
        gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
-       
-       [ceph-qemu-noarch]
-       name=Ceph QEMU noarch
-       baseurl=http://ceph.com/packages/ceph-extras/rpm/{distro}/noarch
-       enabled=1
-       priority=2      
-       gpgcheck=1
-       type=rpm-md
-       gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
-       
+               
        [ceph-qemu-source]
-       name=Ceph QEMU Sources
+       name=Ceph Extras Sources
        baseurl=http://ceph.com/packages/ceph-extras/rpm/{distro}/SRPMS
        enabled=1
        priority=2
@@ -92,6 +83,11 @@ To install QEMU, execute the following:
 
        sudo yum update
 
+#. Ensure that non-priority versions are removed. ::
+
+       sudo yum remove qemu-kvm qemu-kvm-tools qemu-img
+       sudo yum clean all
+
 #. Install QEMU for Ceph. :: 
 
        sudo yum install qemu-kvm qemu-kvm-tools qemu-img