Revert "CLOUDSTACK-574: Add Ceph RBD documentation" This reverts commit 7753275b3777a3ae69d083d7e1df430f34b7f936.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/69b0c149 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/69b0c149 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/69b0c149 Branch: refs/heads/cisco-vnmc-api-integration Commit: 69b0c149d832be6554e4c5d53bb647d26ff69bd7 Parents: 3b35063 Author: Joe Brockmeier <[email protected]> Authored: Fri Apr 12 09:32:17 2013 -0500 Committer: Joe Brockmeier <[email protected]> Committed: Fri Apr 12 09:32:17 2013 -0500 ---------------------------------------------------------------------- .../hypervisor-host-install-primary-storage.xml | 62 --------------- docs/en-US/hypervisor-kvm-install-flow.xml | 1 - docs/en-US/primary-storage-add.xml | 5 - 3 files changed, 0 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69b0c149/docs/en-US/hypervisor-host-install-primary-storage.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/hypervisor-host-install-primary-storage.xml b/docs/en-US/hypervisor-host-install-primary-storage.xml deleted file mode 100644 index 3e76bfb..0000000 --- a/docs/en-US/hypervisor-host-install-primary-storage.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ -<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent"> -%BOOK_ENTITIES; -]> - -<!-- Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<section id="hypervisor-host-install-primary-storage"> - <title>Adding Primary Storage to a KVM hypervisor</title> - <para>For most Primary Storages there are no special requirements to add primary storage, - it's all done via the management server.</para> - <para>The follow subchapters however describe a couple of prerequisites for adding primary storage to a KVM cluster/hypervisor.</para> - - <section id="hypervisor-host-install-primary-storage-nfs"> - <title>Requirements for NFS primary storage</title> - <para>&PRODUCT; will handle the mounting of the NFS storage, no manual intervention is required.</para> - <para>Before adding the Primary Storage make sure the NFS client packages are installed. It's always useful to do a manual mount on one or - more hypervisors prior to adding the primary storage to make sure the mountpoint works.</para> - </section> - - <section id="hypervisor-host-install-primary-storage-iscsi"> - <title>Requirements for iSCSI primary storage</title> - <para>When adding iSCSI Primary Storage the management server of &PRODUCT; will configure the iSCSI initiator. The requirement however is that - Open-iSCSI is installed on all hypervisors.</para> - </section> - - <section id="hypervisor-host-install-primary-storage-ceph"> - <title>Requirements for Ceph primary storage</title> - <para>Support for RBD Primary Storage was added in &PRODUCT; 4.0 and requires a special version of libvirt.</para> - <para>With the KVM hypervisor &PRODUCT; relies on libvirt for handling it's storage pools. Most versions of libvirt - don't have the RBD storage pool support yet, so a manual compile of libvirt is required.</para> - <para>To use RBD primary storage make sure you hypervisors meet the following requirements</para> - <itemizedlist> - <listitem><para>Make sure librbd is installed on your system.</para></listitem> - <listitem><para>A RBD-enabled Qemu version is installed</para></listitem> - <listitem><para>Libivrt (>= 0.9.13) with RBD storage pool support enabled is installed</para></listitem> - <listitem><para>No /etc/ceph/ceph.conf configuration file is present on your hypervisors.</para></listitem> - </itemizedlist> - <para>After meeting these requirements you can add the RBD storage pool via the WebUI.</para> - <para>Hint: Ubuntu 13.04 meets all these requirements by default.</para> - <note><para>&PRODUCT; doesn't support multiple hostnames when adding a Primary Storage pool. If you have multiple Ceph monitor daemons - it's best to create a Round Robin-DNS record and use that as the hostname for the storage pool.</para></note> - </section> - -</section> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69b0c149/docs/en-US/hypervisor-kvm-install-flow.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/hypervisor-kvm-install-flow.xml b/docs/en-US/hypervisor-kvm-install-flow.xml index 7dfd47d..6cc73e4 100644 --- a/docs/en-US/hypervisor-kvm-install-flow.xml +++ b/docs/en-US/hypervisor-kvm-install-flow.xml @@ -34,5 +34,4 @@ <xi:include href="hypervisor-host-install-network-openvswitch.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="hypervisor-host-install-firewall.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="hypervisor-host-install-finish.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="hypervisor-host-install-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69b0c149/docs/en-US/primary-storage-add.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/primary-storage-add.xml b/docs/en-US/primary-storage-add.xml index ddae418..067cf71 100644 --- a/docs/en-US/primary-storage-add.xml +++ b/docs/en-US/primary-storage-add.xml @@ -37,11 +37,6 @@ <listitem><para>Primary storage cannot be added until a host has been added to the cluster.</para></listitem> <listitem><para>If you do not provision shared primary storage, you must set the global configuration parameter system.vm.local.storage.required to true, or else you will not be able to start VMs.</para></listitem> </itemizedlist> - <note><para>There are some differences between hypervisors regarding Primary Storage. See the list below for more information per hypervisor.</para></note> - <itemizedlist> - <listitem><para><xref linkend="hypervisor-host-install-primary-storage" /></para></listitem> - <listitem><para><xref linkend="xenserver-primary-storage-setup" /></para></listitem> - </itemizedlist> </section> <section id="adding-primary-storage"> <title>Adding Primary Stroage</title>
