From 45ed24da879fe12b921cf03e4a921ccc0582b8d2 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 18 Sep 2015 14:13:21 -0400 Subject: [PATCH] doc: remove ceph-extras Signed-off-by: Alfredo Deza (cherry picked from commit c0ef84fd22aac58b6ec8e58eb4f8dffed306d39e) --- doc/install/install-vm-cloud.rst | 67 +++++++------------------------- 1 file changed, 13 insertions(+), 54 deletions(-) diff --git a/doc/install/install-vm-cloud.rst b/doc/install/install-vm-cloud.rst index 8bdb1e8b85111..a28a76a28f74f 100644 --- a/doc/install/install-vm-cloud.rst +++ b/doc/install/install-vm-cloud.rst @@ -29,77 +29,36 @@ Install QEMU QEMU KVM can interact with Ceph Block Devices via ``librbd``, which is an important feature for using Ceph with cloud platforms. Once you install QEMU, -see `QEMU and Block Devices`_ for usage. +see `QEMU and Block Devices`_ for usage. Debian Packages --------------- QEMU packages are incorporated into Ubuntu 12.04 Precise Pangolin and later -versions. To install QEMU, execute the following:: +versions. To install QEMU, execute the following:: sudo apt-get install qemu - + RPM Packages ------------ To install QEMU, execute the following: -#. Install ``yum-plugin-priorities``. :: - - sudo yum install yum-plugin-priorities - -#. Ensure ``/etc/yum/pluginconf.d/priorities.conf`` exists. - -#. Ensure ``priorities.conf`` enables the plugin. :: - - [main] - enabled = 1 - -.. note:: ceph-extras on RPM-based systems is only needed on EL6-based - distributions (RHEL 6, CentOS 6, Scientific Linux 6). It is not needed - for Fedora or RHEL 7+. -#. 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-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-source] - name=Ceph Extras Sources - baseurl=http://ceph.com/packages/ceph-extras/rpm/{distro}/SRPMS - enabled=1 - priority=2 - gpgcheck=1 - type=rpm-md - gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc - -#. Update your repositories. :: +#. Update your repositories. :: 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. :: +#. Install QEMU for Ceph. :: sudo yum install qemu-kvm qemu-kvm-tools qemu-img - -#. Install additional QEMU packages (optional):: + +#. Install additional QEMU packages (optional):: sudo yum install qemu-guest-agent qemu-guest-agent-win32 - + Building QEMU ------------- @@ -127,7 +86,7 @@ Debian Packages ``libvirt`` packages are incorporated into Ubuntu 12.04 Precise Pangolin and later versions of Ubuntu. To install ``libvirt`` on these distributions, -execute the following:: +execute the following:: sudo apt-get update && sudo apt-get install libvirt-bin @@ -140,8 +99,8 @@ Storage Cluster and you must also install a version of QEMU with ``rbd`` format support. See `Install QEMU`_ for details. -``libvirt`` packages are incorporated into the recent CentOS/RHEL distributions. -To install ``libvirt``, execute the following:: +``libvirt`` packages are incorporated into the recent CentOS/RHEL distributions. +To install ``libvirt``, execute the following:: sudo yum install libvirt @@ -157,7 +116,7 @@ complete the installation. For example:: cd libvirt ./autogen.sh make - sudo make install + sudo make install See `libvirt Installation`_ for details. @@ -166,4 +125,4 @@ See `libvirt Installation`_ for details. .. _libvirt Installation: http://www.libvirt.org/compiling.html .. _AutoGen: http://www.gnu.org/software/autogen/ .. _QEMU and Block Devices: ../../rbd/qemu-rbd -.. _Using libvirt with Ceph Block Device: ../../rbd/libvirt \ No newline at end of file +.. _Using libvirt with Ceph Block Device: ../../rbd/libvirt -- 2.39.5