Updated Branches: refs/heads/master 130492d08 -> 8c1fcef14
fixing build errors. Missing hypervisor-host-install-primary-storage.xml, feedback.xml Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c1fcef1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c1fcef1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c1fcef1 Branch: refs/heads/master Commit: 8c1fcef14d2b241aed563792059251a5f3599f92 Parents: 130492d Author: Radhika PC <[email protected]> Authored: Mon Apr 22 14:00:44 2013 +0530 Committer: Radhika PC <[email protected]> Committed: Mon Apr 22 14:02:29 2013 +0530 ---------------------------------------------------------------------- docs/en-US/changed-API-commands-4.2.xml | 107 +++++++++++ docs/en-US/hypervisor-kvm-install-flow.xml | 2 +- .../hypervisor-support-for-primarystorage.xml | 148 ++++++++------- docs/en-US/limit-accounts-domains.xml | 2 +- 4 files changed, 189 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c1fcef1/docs/en-US/changed-API-commands-4.2.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/changed-API-commands-4.2.xml b/docs/en-US/changed-API-commands-4.2.xml new file mode 100644 index 0000000..cbaa2e3 --- /dev/null +++ b/docs/en-US/changed-API-commands-4.2.xml @@ -0,0 +1,107 @@ +<?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="changed-API-commands-4.2"> + <title>Changed API Commands in 4.2</title> + <informaltable> + <tgroup cols="2" align="left" colsep="1" rowsep="1"> + <thead> + <row> + <entry><para>Parameter Name</para></entry> + <entry><para>Description</para></entry> + </row> + </thead> + <tbody> + <row> + <entry><para>updateResourceLimit</para></entry> + <entry> + <para>Added the following resource types to the <parameter>resourcetype</parameter> + request parameter to set the limits:</para> + <itemizedlist> + <listitem> + <para>CPU</para> + </listitem> + <listitem> + <para>RAM</para> + </listitem> + <listitem> + <para>primary storage</para> + </listitem> + <listitem> + <para>secondary storage</para> + </listitem> + <listitem> + <para>network rate</para> + </listitem> + </itemizedlist> + </entry> + </row> + <row> + <entry><para>updateResourceCount</para></entry> + <entry> + <para>Added the following resource types to the <parameter>resourcetype</parameter> + request parameter to set the limits:</para> + <itemizedlist> + <listitem> + <para>CPU</para> + </listitem> + <listitem> + <para>RAM</para> + </listitem> + <listitem> + <para>primary storage</para> + </listitem> + <listitem> + <para>secondary storage</para> + </listitem> + <listitem> + <para>network rate</para> + </listitem> + </itemizedlist> + </entry> + </row> + <row> + <entry><para>listResourceLimits </para></entry> + <entry> + <para>Added the following resource types to the <parameter>resourcetype</parameter> + request parameter:</para> + <itemizedlist> + <listitem> + <para>CPU</para> + </listitem> + <listitem> + <para>RAM</para> + </listitem> + <listitem> + <para>primary storage</para> + </listitem> + <listitem> + <para>secondary storage</para> + </listitem> + <listitem> + <para>network rate</para> + </listitem> + </itemizedlist> + </entry> + </row> + </tbody> + </tgroup> + </informaltable> +</section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c1fcef1/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..aa19e47 100644 --- a/docs/en-US/hypervisor-kvm-install-flow.xml +++ b/docs/en-US/hypervisor-kvm-install-flow.xml @@ -34,5 +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"; /> + <xi:include href="hypervisor-support-for-primarystorage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c1fcef1/docs/en-US/hypervisor-support-for-primarystorage.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml index 7c2596e..fdef1f2 100644 --- a/docs/en-US/hypervisor-support-for-primarystorage.xml +++ b/docs/en-US/hypervisor-support-for-primarystorage.xml @@ -22,71 +22,83 @@ under the License. --> <section id="hypervisor-support-for-primarystorage"> - <title>Hypervisor Support for Primary Storage</title> - <para>The following table shows storage options and parameters for different hypervisors.</para> - <informaltable> - <tgroup cols="5"> - <colspec colname="c1" colnum="1" colwidth="34%" /> - <colspec colname="c2" colnum="2" colwidth="16%" /> - <colspec colname="c3" colnum="3" colwidth="16%"/> - <colspec colname="c4" colnum="4" colwidth="17%"/> - <colspec colname="c5" colnum="5" colwidth="17%"/> - <thead> - <row> - <entry></entry> - <entry><para>VMware vSphere</para></entry> - <entry><para>Citrix XenServer</para></entry> - <entry><para>KVM</para></entry> - </row> - </thead> - <tbody> - <row> - <entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and - Snapshots</emphasis></emphasis></para></entry> - <entry><para>VMDK</para></entry> - <entry><para>VHD</para></entry> - <entry><para>QCOW2</para></entry> - </row> - <row> - <entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry> - <entry><para>VMFS</para></entry> - <entry><para>Clustered LVM</para></entry> - <entry><para>Yes, via Shared Mountpoint</para></entry> - </row> - <row> - <entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry> - <entry><para>VMFS</para></entry> - <entry><para>Yes, via Existing SR</para></entry> - <entry><para>Yes, via Shared Mountpoint</para></entry> - </row> - <row> - <entry><para><emphasis role="bold">NFS support</emphasis></para></entry> - <entry><para>Y</para></entry> - <entry><para>Y</para></entry> - <entry><para>Y</para></entry> - </row> - - <row> - <entry><para><emphasis role="bold">Local storage support</emphasis></para></entry> - <entry><para>Y</para></entry> - <entry><para>Y</para></entry> - <entry><para>Y</para></entry> - </row> - - <row> - <entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry> - <entry><para>NFS and iSCSI</para></entry> - <entry><para>NFS</para></entry> - <entry><para>NFS</para></entry> - </row> - - </tbody> - </tgroup> - </informaltable> - <para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning. As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes.</para> - <para>KVM supports "Shared Mountpoint" storage. A shared mountpoint is a file system path local to each server in a given cluster. The path must be the same across all Hosts in the cluster, for example /mnt/primary1. This shared mountpoint is assumed to be a clustered filesystem such as OCFS2. In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS. The &PRODUCT; requires that the administrator insure that the storage is available</para> - <!-- <para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para> --> - <para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type.</para> - <para>Local storage is an option for primary storage for vSphere, XenServer, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration.</para> - <para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity.</para> - </section> + <title>Hypervisor Support for Primary Storage</title> + <para>The following table shows storage options and parameters for different hypervisors.</para> + <informaltable> + <tgroup cols="5"> + <colspec colname="c1" colnum="1" colwidth="34%"/> + <colspec colname="c2" colnum="2" colwidth="16%"/> + <colspec colname="c3" colnum="3" colwidth="16%"/> + <colspec colname="c4" colnum="4" colwidth="17%"/> + <colspec colname="c5" colnum="5" colwidth="17%"/> + <thead> + <row> + <entry/> + <entry><para>VMware vSphere</para></entry> + <entry><para>Citrix XenServer</para></entry> + <entry><para>KVM</para></entry> + </row> + </thead> + <tbody> + <row> + <entry><para><emphasis role="bold"><emphasis role="bold">Format for Disks, Templates, and + Snapshots</emphasis></emphasis></para></entry> + <entry><para>VMDK</para></entry> + <entry><para>VHD</para></entry> + <entry><para>QCOW2</para></entry> + </row> + <row> + <entry><para><emphasis role="bold">iSCSI support</emphasis></para></entry> + <entry><para>VMFS</para></entry> + <entry><para>Clustered LVM</para></entry> + <entry><para>Yes, via Shared Mountpoint</para></entry> + </row> + <row> + <entry><para><emphasis role="bold">Fiber Channel support</emphasis></para></entry> + <entry><para>VMFS</para></entry> + <entry><para>Yes, via Existing SR</para></entry> + <entry><para>Yes, via Shared Mountpoint</para></entry> + </row> + <row> + <entry><para><emphasis role="bold">NFS support</emphasis></para></entry> + <entry><para>Y</para></entry> + <entry><para>Y</para></entry> + <entry><para>Y</para></entry> + </row> + <row> + <entry><para><emphasis role="bold">Local storage support</emphasis></para></entry> + <entry><para>Y</para></entry> + <entry><para>Y</para></entry> + <entry><para>Y</para></entry> + </row> + <row> + <entry><para><emphasis role="bold">Storage over-provisioning</emphasis></para></entry> + <entry><para>NFS and iSCSI</para></entry> + <entry><para>NFS</para></entry> + <entry><para>NFS</para></entry> + </row> + </tbody> + </tgroup> + </informaltable> + <para>XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes + and does not support over-provisioning in the hypervisor. The storage server itself, however, + can support thin-provisioning. As a result the &PRODUCT; can still support storage + over-provisioning by running on thin-provisioned storage volumes.</para> + <para>KVM supports "Shared Mountpoint" storage. A shared mountpoint is a file system path local to + each server in a given cluster. The path must be the same across all Hosts in the cluster, for + example /mnt/primary1. This shared mountpoint is assumed to be a clustered filesystem such as + OCFS2. In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done + with NFS. The &PRODUCT; requires that the administrator insure that the storage is + available</para> + <!-- <para>Oracle VM supports both iSCSI and NFS storage. When iSCSI is used with OVM, the &PRODUCT; administrator is responsible for setting up iSCSI on the host, including re-mounting the storage after the host recovers from a failure such as a network outage. With other hypervisors, &PRODUCT; takes care of mounting the iSCSI target on the host whenever it discovers a connection with an iSCSI server and unmounting the target when it discovers the connection is down.</para> --> + <para>With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global + configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. + This is independent of hypervisor type.</para> + <para>Local storage is an option for primary storage for vSphere, XenServer, and KVM. When the + local disk option is enabled, a local disk storage pool is automatically created on each host. + To use local storage for the System Virtual Machines (such as the Virtual Router), set + system.vm.use.local.storage to true in global configuration.</para> + <para>&PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could + provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and + then add a second iSCSI LUN when the first approaches capacity.</para> +</section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c1fcef1/docs/en-US/limit-accounts-domains.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/limit-accounts-domains.xml b/docs/en-US/limit-accounts-domains.xml index 64a886e..da45dab 100644 --- a/docs/en-US/limit-accounts-domains.xml +++ b/docs/en-US/limit-accounts-domains.xml @@ -176,7 +176,7 @@ <para>If any operation needs to pass through two of more resource limit check, then the lower of 2 limits will be enforced, For e.g. if an account has VM limit of 10 and CPU limit of 20 and user under that account requests 5 VMs of 4 CPUs each, after this user can - deploy 5 more VMs(because VM limit is 10) but user has exausted his CPU limit and cannot + deploy 5 more VMs(because VM limit is 10) but user has exhausted his CPU limit and cannot deploy any more instance.</para> </listitem> </itemizedlist>
