You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/04/12 15:08:21 UTC
[1/3] git commit: updated refs/heads/master to 0f8a46c
Updated Branches:
refs/heads/master 38df62865 -> 0f8a46c58
CLOUDSTACK-574: Add Ceph RBD documentation
This commit also add some extra information about NFS and iSCSI
Primary Storage on a KVM hypervisor.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7753275b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7753275b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7753275b
Branch: refs/heads/master
Commit: 7753275b3777a3ae69d083d7e1df430f34b7f936
Parents: 6d4b035
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Apr 12 15:02:53 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Apr 12 15:07:53 2013 +0200
----------------------------------------------------------------------
.../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, 68 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7753275b/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
new file mode 100644
index 0000000..3e76bfb
--- /dev/null
+++ b/docs/en-US/hypervisor-host-install-primary-storage.xml
@@ -0,0 +1,62 @@
+<?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/7753275b/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 6cc73e4..7dfd47d 100644
--- a/docs/en-US/hypervisor-kvm-install-flow.xml
+++ b/docs/en-US/hypervisor-kvm-install-flow.xml
@@ -34,4 +34,5 @@
<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/7753275b/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 067cf71..ddae418 100644
--- a/docs/en-US/primary-storage-add.xml
+++ b/docs/en-US/primary-storage-add.xml
@@ -37,6 +37,11 @@
<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>
[3/3] git commit: updated refs/heads/master to 0f8a46c
Posted by wi...@apache.org.
tools: Allow setting the output format for the docs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f8a46c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f8a46c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f8a46c5
Branch: refs/heads/master
Commit: 0f8a46c5802be6534d8d38cca3eb7b06568738ce
Parents: 7753275
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Apr 12 15:07:24 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Apr 12 15:07:54 2013 +0200
----------------------------------------------------------------------
tools/build/build_docs.sh | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f8a46c5/tools/build/build_docs.sh
----------------------------------------------------------------------
diff --git a/tools/build/build_docs.sh b/tools/build/build_docs.sh
index c1b1f13..62617a3 100755
--- a/tools/build/build_docs.sh
+++ b/tools/build/build_docs.sh
@@ -19,22 +19,25 @@
sourcedir=~/incubator-cloudstack/
common_content_dir=/usr/share/publican/Common_Content
publican_path=/usr/bin/publican
+output_format="html,pdf"
usage(){
echo "usage: $0 [-s source dir] [-c publican common content] [-p path to publican]"
echo " -s sets the source directory (defaults to $sourcedir)"
echo " -c sets the public common content directory (defaults to $common_content_dir)"
echo " -p sets the path to the publican binary (defaults to $publican_path)"
+ echo " -f sets the output format (defaults to $output_format)"
echo " -h"
}
-while getopts v:s:c:p:h opt
+while getopts v:s:c:p:f:h opt
do
case "$opt" in
v) version="$OPTARG";;
s) sourcedir="$OPTARG";;
c) common_content_dir="$OPTARG";;
p) publican_path="$OPTARG";;
+ f) output_format="$OPTARG";;
h) usage
exit 0;;
\?)
@@ -56,5 +59,5 @@ fi
cd $sourcedir/docs
cp -R /usr/share/publican/Common_Content .
ln -s $sourcedir/docs/publican-cloudstack Common_Content/cloudstack
-publican build --config=publican-installation.cfg --formats html,pdf --langs en-US --common_content=$sourcedir/docs/Common_Content
+publican build --config=publican-installation.cfg --formats $output_format --langs en-US --common_content=$sourcedir/docs/Common_Content
rm -r Common_Content
\ No newline at end of file
[2/3] git commit: updated refs/heads/master to 0f8a46c
Posted by wi...@apache.org.
tools: A small fix for the script to build the docs with
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d4b035f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d4b035f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d4b035f
Branch: refs/heads/master
Commit: 6d4b035f2cf2d5ee9d1e7c6def9b802d74ed6d6b
Parents: 38df628
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Apr 12 13:50:08 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Apr 12 15:07:53 2013 +0200
----------------------------------------------------------------------
tools/build/build_docs.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d4b035f/tools/build/build_docs.sh
----------------------------------------------------------------------
diff --git a/tools/build/build_docs.sh b/tools/build/build_docs.sh
index 8bb63e3..c1b1f13 100755
--- a/tools/build/build_docs.sh
+++ b/tools/build/build_docs.sh
@@ -48,6 +48,11 @@ if [ ! -x "$publican_path" ]; then
exit 1
fi
+if [ ! -d "$sourcedir/docs" ]; then
+ echo "$sourcedir/docs doesn't seem to exist? Maybe set -s?"
+ exit 1
+fi
+
cd $sourcedir/docs
cp -R /usr/share/publican/Common_Content .
ln -s $sourcedir/docs/publican-cloudstack Common_Content/cloudstack