You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jz...@apache.org on 2012/10/20 20:04:35 UTC
git commit: Removing OVM-specific documentation.
Updated Branches:
refs/heads/master 9a90dc227 -> dffe67085
Removing OVM-specific documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/dffe6708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/dffe6708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/dffe6708
Branch: refs/heads/master
Commit: dffe67085e15fbb53bfd8a69d752b5ec02258ca6
Parents: 9a90dc2
Author: Joe Brockmeier <jz...@zonker.net>
Authored: Sat Oct 20 13:03:17 2012 -0500
Committer: Joe Brockmeier <jz...@zonker.net>
Committed: Sat Oct 20 13:03:17 2012 -0500
----------------------------------------------------------------------
docs/en-US/about-clusters.xml | 2 +-
docs/en-US/add-more-clusters.xml | 2 +-
docs/en-US/advanced-zone-configuration.xml | 4 +-
docs/en-US/attaching-volume.xml | 3 +-
docs/en-US/basic-zone-configuration.xml | 2 +-
docs/en-US/cluster-add.xml | 2 +-
docs/en-US/create-template-from-snapshot.xml | 2 +-
docs/en-US/creating-vms.xml | 2 +-
docs/en-US/detach-move-volumes.xml | 2 +-
docs/en-US/feature-overview.xml | 5 +---
docs/en-US/host-add-xenserver-kvm-ovm.xml | 20 +++++++-------
docs/en-US/host-add.xml | 2 +-
docs/en-US/hypervisor-installation.xml | 4 +-
.../hypervisor-support-for-primarystorage.xml | 11 +------
docs/en-US/manual-live-migration.xml | 2 +-
docs/en-US/minimum-system-requirements.xml | 2 +-
docs/en-US/ovm-requirements.xml | 2 +-
docs/en-US/release-notes.xml | 11 ++++++-
docs/en-US/runtime-behavior-of-primary-storage.xml | 2 +-
docs/en-US/upload-existing-volume-to-vm.xml | 4 +-
docs/en-US/upload-template.xml | 4 +-
docs/en-US/working-with-snapshots.xml | 4 +-
docs/en-US/working-with-volumes.xml | 2 +-
23 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/about-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-clusters.xml b/docs/en-US/about-clusters.xml
index a39cf71..745ad89 100644
--- a/docs/en-US/about-clusters.xml
+++ b/docs/en-US/about-clusters.xml
@@ -26,7 +26,7 @@
<title>About Clusters</title>
<para>
A cluster provides a way to group hosts. To be precise, a cluster is a
- XenServer server pool, a set of KVM servers, a set of OVM hosts, or a
+ XenServer server pool, a set of KVM servers, <!-- a set of OVM hosts -->, or a
VMware cluster preconfigured in vCenter. The hosts in a cluster all
have identical hardware, run the same hypervisor, are on the same subnet,
and access the same shared primary storage. Virtual machine instances
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/add-more-clusters.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-more-clusters.xml b/docs/en-US/add-more-clusters.xml
index a2e41e3..894b4d8 100644
--- a/docs/en-US/add-more-clusters.xml
+++ b/docs/en-US/add-more-clusters.xml
@@ -24,6 +24,6 @@
so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
<xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
<xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml
index 302265a..fe7f6d3 100644
--- a/docs/en-US/advanced-zone-configuration.xml
+++ b/docs/en-US/advanced-zone-configuration.xml
@@ -180,9 +180,9 @@
<listitem>
<para>KVM Installation and Configuration</para>
</listitem>
- <listitem>
+ <!-- <listitem>
<para>Oracle VM (OVM) Installation and Configuration</para>
- </listitem>
+ </listitem> -->
</itemizedlist>
<para>To configure the first host, enter the following, then click Next:</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/attaching-volume.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/attaching-volume.xml b/docs/en-US/attaching-volume.xml
index 385609b..360555e 100644
--- a/docs/en-US/attaching-volume.xml
+++ b/docs/en-US/attaching-volume.xml
@@ -37,7 +37,8 @@
</inlinemediaobject>
</para></listitem>
<listitem><para>In the Instance popup, choose the VM to which you want to attach the volume. You will only see instances to which you are allowed to attach volumes; for example, a user will see only instances created by that user, but the administrator will have more choices.</para>
- <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para></listitem>
+ <!-- <para>If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
+ </listitem>
<listitem><para>When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes.</para></listitem>
</orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/basic-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml
index 00980c5..b2c754b 100644
--- a/docs/en-US/basic-zone-configuration.xml
+++ b/docs/en-US/basic-zone-configuration.xml
@@ -125,7 +125,7 @@
<listitem><para>Citrix XenServer Installation and Configuration</para></listitem>
<listitem><para>VMware vSphere Installation and Configuration</para></listitem>
<listitem><para>KVM vSphere Installation and Configuration</para></listitem>
- <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
+ <!-- <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem> -->
</itemizedlist>
<para>To configure the first host, enter the following, then click Next:</para>
<itemizedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/cluster-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml
index 89f9bd2..3046c5e 100644
--- a/docs/en-US/cluster-add.xml
+++ b/docs/en-US/cluster-add.xml
@@ -26,6 +26,6 @@
<title>Adding a Cluster</title>
<para>You need to tell &PRODUCT; about the hosts that it will manage. Hosts exist inside clusters, so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
<xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/create-template-from-snapshot.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/create-template-from-snapshot.xml b/docs/en-US/create-template-from-snapshot.xml
index 3075032..80e660f 100644
--- a/docs/en-US/create-template-from-snapshot.xml
+++ b/docs/en-US/create-template-from-snapshot.xml
@@ -24,6 +24,6 @@
<section id="create-template-from-snapshot">
<title>Creating a Template from a Snapshot</title>
- <note><para>Not supported by Oracle VM</para></note>
+ <!-- <note><para>Not supported by Oracle VM</para></note> -->
<para>If you do not want to stop the VM in order to use the Create Template menu item (as described in <xref linkend="create-template-from-existing-vm"/>), you can create a template directly from any snapshot through the &PRODUCT; UI.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/creating-vms.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml
index dc37dbb..9da4aea 100644
--- a/docs/en-US/creating-vms.xml
+++ b/docs/en-US/creating-vms.xml
@@ -44,6 +44,6 @@
<listitem><para>Click Add Instance.</para></listitem>
<listitem><para>Select ISO Boot, and follow the steps in the wizard.</para></listitem>
<listitem><para>Click Submit and your VM will be created and started.</para></listitem>
- <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem>
+ <!-- <listitem><para>(Oracle VM only) After ISO installation, the installer reboots into the operating system. Due to a known issue in OVM, the reboot will place the VM in the Stopped state. In the &PRODUCT; UI, detach the ISO from the VM (so that the VM will not boot from the ISO again), then click the Start button to restart the VM.</para></listitem> -->
</orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/detach-move-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml
index a00e15f..25323c9 100644
--- a/docs/en-US/detach-move-volumes.xml
+++ b/docs/en-US/detach-move-volumes.xml
@@ -27,7 +27,7 @@
<note><para>This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration </para></note>
<para>A volume can be detached from a guest VM and attached to another guest. Both &PRODUCT; administrators and users can detach volumes from VMs and move them to other VMs.</para>
<para>If the two VMs are in different clusters, and the volume is large, it may take several minutes for the volume to be moved to the new VM.</para>
- <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para>
+ <!-- <para>If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it.</para> -->
<orderedlist>
<listitem><para>Log in to the &PRODUCT; UI as a user or admin.</para></listitem>
<listitem><para>In the left navigation bar, click Storage, and choose Volumes in Select View. Alternatively, if you know which VM the volume is attached to, you can click Instances, click the VM name, and click View Volumes.</para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/feature-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/feature-overview.xml b/docs/en-US/feature-overview.xml
index a417839..501bca8 100644
--- a/docs/en-US/feature-overview.xml
+++ b/docs/en-US/feature-overview.xml
@@ -28,10 +28,7 @@
<emphasis role="bold">Multiple Hypervisor Support</emphasis>
</para>
<para>
- &PRODUCT; works with a variety of hypervisors. A single cloud deployment can contain multiple hypervisor implementations. You have the complete freedom to choose the right hypervisor for your workload.
- </para>
- <para>
- &PRODUCT; is designed to work with open source Xen and KVM hypervisors as well as enterprise-grade hypervisors such as Citrix XenServer, VMware vSphere, and Oracle VM (OVM). You can also provision “bare metal” hosts with no hypervisor (Beta feature. Untested in &PRODUCT; 3.0.x.)
+ &PRODUCT; works with a variety of hypervisors, and a single cloud deployment can contain multiple hypervisor implementations. The current release of &PRODUCT; supports pre-packaged enterprise solutions like Citrix XenServer and VMware vSphere, as well as KVM or Xen running on Ubuntu or CentOS.
</para>
<para>
<emphasis role="bold">Massively Scalable Infrastructure Management</emphasis>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/host-add-xenserver-kvm-ovm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add-xenserver-kvm-ovm.xml b/docs/en-US/host-add-xenserver-kvm-ovm.xml
index 855177a..4bbeefc 100644
--- a/docs/en-US/host-add-xenserver-kvm-ovm.xml
+++ b/docs/en-US/host-add-xenserver-kvm-ovm.xml
@@ -22,10 +22,10 @@
under the License.
-->
<section id="host-add-xenserver-kvm-ovm">
- <title>Adding a Host (XenServer, KVM, or OVM)</title>
- <para>XenServer, KVM, and Oracle VM (OVM) hosts can be added to a cluster at any time.</para>
+ <title>Adding a Host (XenServer or KVM)</title>
+ <para>XenServer and KVM hosts can be added to a cluster at any time.</para>
<section>
- <title>Requirements for XenServer, KVM, and OVM Hosts</title>
+ <title>Requirements for XenServer and KVM Hosts</title>
<warning>
<para>Make sure the hypervisor host does not have any VMs already running before you add it to
&PRODUCT;.</para>
@@ -85,14 +85,14 @@
</listitem>
</itemizedlist>
</section>
- <section>
- <title>OVM Host Additional Requirements</title>
+ <!-- <section>
+ <title>OVM Host Additional Requirements</title>
<para>Before adding a used host in &PRODUCT;, as part of the cleanup procedure on the host, be
- sure to remove /etc/ovs-agent/db/.</para>
- </section>
+ sure to remove /etc/ovs-agent/db/.</para>
+ </section> -->
</section>
<section>
- <title>Adding a XenServer, KVM, or OVM Host</title>
+ <title>Adding a XenServer or KVM Host</title>
<itemizedlist>
<listitem>
<para>If you have not already done so, install the hypervisor software on the host. You will
@@ -130,8 +130,8 @@
<para>Username. Usually root.</para>
</listitem>
<listitem>
- <para>Password. This is the password for the user named above (from your XenServer, KVM,
- or OVM install).</para>
+ <para>Password. This is the password for the user from your XenServer or KVM
+ install).</para>
</listitem>
<listitem>
<para>Host Tags (Optional). Any labels that you use to categorize hosts for ease of
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/host-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml
index 37cf28d..74509d6 100644
--- a/docs/en-US/host-add.xml
+++ b/docs/en-US/host-add.xml
@@ -39,4 +39,4 @@
</orderedlist>
<xi:include href="host-add-xenserver-kvm-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="host-add-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/hypervisor-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-installation.xml b/docs/en-US/hypervisor-installation.xml
index cc6a762..b0fc9f4 100644
--- a/docs/en-US/hypervisor-installation.xml
+++ b/docs/en-US/hypervisor-installation.xml
@@ -27,5 +27,5 @@
<xi:include href="hypervisor-kvm-install-flow.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="citrix-xenserver-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="vmware-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="ovm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-</chapter>
\ No newline at end of file
+ <!-- <xi:include href="ovm-install.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+</chapter>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/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 ca266a4..055c182 100644
--- a/docs/en-US/hypervisor-support-for-primarystorage.xml
+++ b/docs/en-US/hypervisor-support-for-primarystorage.xml
@@ -40,7 +40,6 @@
<entry><para>VMware vSphere</para></entry>
<entry><para>Citrix XenServer</para></entry>
<entry><para>KVM</para></entry>
- <entry><para>Oracle VM</para></entry>
</row>
</thead>
<tbody>
@@ -50,28 +49,24 @@
<entry><para>VMDK</para></entry>
<entry><para>VHD</para></entry>
<entry><para>QCOW2</para></entry>
- <entry><para>RAW</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>
- <entry><para>Yes, via OCFS2M</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>
- <entry><para>No</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>
- <entry><para>Y</para></entry>
</row>
<row>
@@ -79,7 +74,6 @@
<entry><para>Y</para></entry>
<entry><para>Y</para></entry>
<entry><para>Y</para></entry>
- <entry><para>Y</para></entry>
</row>
<row>
@@ -87,7 +81,6 @@
<entry><para>NFS and iSCSI</para></entry>
<entry><para>NFS</para></entry>
<entry><para>NFS</para></entry>
- <entry><para>No</para></entry>
</row>
</tbody>
@@ -95,8 +88,8 @@
</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>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, Oracle VM, 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>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/incubator-cloudstack/blob/dffe6708/docs/en-US/manual-live-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/manual-live-migration.xml b/docs/en-US/manual-live-migration.xml
index 390b417..30a5c11 100644
--- a/docs/en-US/manual-live-migration.xml
+++ b/docs/en-US/manual-live-migration.xml
@@ -31,7 +31,7 @@
<listitem><para>The destination host must be in the same cluster as the original host.</para></listitem>
<listitem><para>The VM must not be using local disk storage.</para></listitem>
<listitem><para>The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available.</para></listitem>
- <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem>
+ <!-- <listitem><para>(OVM) If the VM is running on the OVM hypervisor, it must not have an ISO attached. Live migration of a VM with attached ISO is not supported in OVM.</para></listitem> -->
</itemizedlist>
<para>To manually live migrate a virtual machine</para>
<orderedlist>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
index 7c0f15f..df23715 100644
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@ -64,7 +64,7 @@
<listitem><para><xref linkend="hypervisor-kvm-requirements"/></para></listitem>
<listitem><para><xref linkend="system-requirements-xenserver-hosts"/></para></listitem>
<listitem><para><xref linkend="vmware-requirements"/></para></listitem>
- <listitem><para><xref linkend="ovm-requirements"/></para></listitem>
+ <!-- <listitem><para><xref linkend="ovm-requirements"/></para></listitem> -->
</itemizedlist>
</section>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/ovm-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ovm-requirements.xml b/docs/en-US/ovm-requirements.xml
index aadc71f..70a8920 100644
--- a/docs/en-US/ovm-requirements.xml
+++ b/docs/en-US/ovm-requirements.xml
@@ -25,4 +25,4 @@
<section id="ovm-requirements">
<title>System Requirements for OVM</title>
<para>TODO</para>
-</section>
\ No newline at end of file
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/release-notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/release-notes.xml b/docs/en-US/release-notes.xml
index a4a2417..849dc5a 100644
--- a/docs/en-US/release-notes.xml
+++ b/docs/en-US/release-notes.xml
@@ -1254,9 +1254,9 @@ Done restarting router(s).
<listitem>
<para>KVM : QCOW2</para>
</listitem>
- <listitem>
+ <!-- <listitem>
<para>OVM : RAW</para>
- </listitem>
+ </listitem> -->
</itemizedlist>
</section>
<section id="dedicated-ha-hosts">
@@ -2025,6 +2025,13 @@ Done restarting router(s).
</entry>
</row>
<row>
+ <entry><para>CLOUDSTACK-368</para></entry>
+ <entry><para>OVM - cannot create guest VM</para>
+ <para>This source code release has regressed from the CloudStack 2.2.x code
+ and is unable to support Oracle VM (OVM).</para>
+ </entry>
+ </row>
+ <row>
<entry><para>CLOUDSTACK-279</para></entry>
<entry><para>Deleting a project fails when executed by the regular user. This works as
expected for root/domain admin. To workaround, perform either of the
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/runtime-behavior-of-primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/runtime-behavior-of-primary-storage.xml b/docs/en-US/runtime-behavior-of-primary-storage.xml
index c656390..479ebce 100644
--- a/docs/en-US/runtime-behavior-of-primary-storage.xml
+++ b/docs/en-US/runtime-behavior-of-primary-storage.xml
@@ -24,7 +24,7 @@
<section id="runtime-behavior-of-primary-storage">
<title>Runtime Behavior of Primary Storage</title>
- <para>Root volumes are created automatically when a virtual machine is created. Root volumes are deleted when the VM is destroyed. Data volumes can be created and dynamically attached to VMs (although, when the Oracle VM hypervisor is used, the VM must be stopped before an additional volume can be attached). Data volumes are not deleted when VMs are destroyed.</para>
+ <para>Root volumes are created automatically when a virtual machine is created. Root volumes are deleted when the VM is destroyed. Data volumes can be created and dynamically attached to VMs. <!-- (although, when the Oracle VM hypervisor is used, the VM must be stopped before an additional volume can be attached)--> Data volumes are not deleted when VMs are destroyed.</para>
<para>Administrators should monitor the capacity of primary storage devices and add additional primary storage as needed. See the Advanced Installation Guide.</para>
<para>Administrators add primary storage to the system by creating a &PRODUCT; storage pool. Each storage pool is associated with a cluster.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/upload-existing-volume-to-vm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml
index 5966ce6..86dc8e5 100644
--- a/docs/en-US/upload-existing-volume-to-vm.xml
+++ b/docs/en-US/upload-existing-volume-to-vm.xml
@@ -59,10 +59,10 @@
<entry><para>KVM</para></entry>
<entry><para>QCOW2</para></entry>
</row>
- <row>
+ <!-- <row>
<entry><para>OVM</para></entry>
<entry><para>RAW</para></entry>
- </row>
+ </row> -->
</tbody>
</tgroup>
</informaltable></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/upload-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/upload-template.xml b/docs/en-US/upload-template.xml
index 51aeb5a..40b64bb 100644
--- a/docs/en-US/upload-template.xml
+++ b/docs/en-US/upload-template.xml
@@ -24,7 +24,7 @@
<section id="upload-template">
<title>Uploading Templates</title>
- <note><para>If you are uploading a template that was created using vSphere Client, be sure the OVA file does not contain an ISO. If it does, the deployment of VMs from the template will fail.</para></note>
+ <warning><title>vSphere Templates and ISOs</title><para>If you are uploading a template that was created using vSphere Client, be sure the OVA file does not contain an ISO. If it does, the deployment of VMs from the template will fail.</para></warning>
<para>Templates are uploaded based on a URL. HTTP is the supported access protocol. Templates are frequently large files. You can optionally gzip them to decrease upload times.</para>
<para>To upload a template:</para>
<orderedlist>
@@ -39,7 +39,7 @@
<itemizedlist>
<listitem><para>If the operating system of the stopped VM is listed, choose it.</para></listitem>
<listitem><para>If the OS type of the stopped VM is not listed, choose Other.</para>
- <note><para>Generally you should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.</para></note></listitem>
+ <note><para>You should not choose an older version of the OS than the version in the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will in general not work. In those cases you should choose Other.</para></note></listitem>
</itemizedlist>
</listitem>
<listitem><para><emphasis role="bold">Hypervisor</emphasis></para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/working-with-snapshots.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-snapshots.xml b/docs/en-US/working-with-snapshots.xml
index 6145ffd..d6b1458 100644
--- a/docs/en-US/working-with-snapshots.xml
+++ b/docs/en-US/working-with-snapshots.xml
@@ -25,8 +25,8 @@
<section id="working-with-snapshots">
<title>Working with Snapshots</title>
<para>(Supported for the following hypervisors: <emphasis role="bold">XenServer</emphasis>, <emphasis role="bold">VMware vSphere</emphasis>, and <emphasis role="bold">KVM</emphasis>)</para>
- <para>&PRODUCT; supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. If you are using the Oracle VM hypervisor, you can not take snapshots, since OVM does not support them.</para>
- <para>Snapshots may be taken for volumes, including both root and data disks (except when the Oracle VM hypervisor is used, which does not support snapshots). The administrator places a limit on the number of stored snapshots per user. Users can create new volumes from the snapshot for recovery of particular files and they can create templates from snapshots to boot from a restored disk.</para>
+ <para>&PRODUCT; supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. <!-- If you are using the Oracle VM hypervisor, you can not take snapshots, since OVM does not support them. --></para>
+ <para>Snapshots may be taken for volumes, including both root and data disks. The administrator places a limit on the number of stored snapshots per user. Users can create new volumes from the snapshot for recovery of particular files and they can create templates from snapshots to boot from a restored disk.</para>
<para>Users can create snapshots manually or by setting up automatic recurring snapshot policies. Users can also create disk volumes from snapshots, which may be attached to a VM like any other disk volume. Snapshots of both root disks and data disks are supported. However, &PRODUCT; does not currently support booting a VM from a recovered root disk. A disk recovered from snapshot of a root disk is treated as a regular data disk; the data on recovered disk can be accessed by attaching the disk to a VM.</para>
<para>A completed snapshot is copied from primary storage to secondary storage, where it is stored until deleted or purged by newer snapshot.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dffe6708/docs/en-US/working-with-volumes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-volumes.xml b/docs/en-US/working-with-volumes.xml
index 8aa0420..1179120 100644
--- a/docs/en-US/working-with-volumes.xml
+++ b/docs/en-US/working-with-volumes.xml
@@ -31,7 +31,7 @@
<para>Volumes are created for a specific hypervisor type. A volume that has
been attached to guest using one hypervisor type (e.g, XenServer) may not
be attached to a guest that is using another hypervisor type (e.g.
- vSphere, Oracle VM, KVM). This is because the different hypervisors use
+ vSphere, KVM). This is because the different hypervisors use
different disk image formats.
</para>
<para>&PRODUCT; defines a volume as a unit of storage available to a guest