diff --git a/docs/en-US/about-clusters.xml b/docs/en-US/about-clusters.xml index a39cf716168..745ad89d118 100644 --- a/docs/en-US/about-clusters.xml +++ b/docs/en-US/about-clusters.xml @@ -26,7 +26,7 @@ About Clusters 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, , 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 diff --git a/docs/en-US/add-more-clusters.xml b/docs/en-US/add-more-clusters.xml index a2e41e38f84..894b4d80737 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. - + diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml index 302265a38c9..fe7f6d3a4a0 100644 --- a/docs/en-US/advanced-zone-configuration.xml +++ b/docs/en-US/advanced-zone-configuration.xml @@ -180,9 +180,9 @@ KVM Installation and Configuration - + To configure the first host, enter the following, then click Next: diff --git a/docs/en-US/attaching-volume.xml b/docs/en-US/attaching-volume.xml index 385609b8f57..360555eac06 100644 --- a/docs/en-US/attaching-volume.xml +++ b/docs/en-US/attaching-volume.xml @@ -37,7 +37,8 @@ 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. - If the VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it. + + When the volume has been attached, you should be able to see it by clicking Instances, the instance name, and View Volumes. diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml index 00980c556a0..b2c754b1f21 100644 --- a/docs/en-US/basic-zone-configuration.xml +++ b/docs/en-US/basic-zone-configuration.xml @@ -125,7 +125,7 @@ Citrix XenServer Installation and Configuration VMware vSphere Installation and Configuration KVM vSphere Installation and Configuration - Oracle VM (OVM) Installation and Configuration + To configure the first host, enter the following, then click Next: diff --git a/docs/en-US/cluster-add.xml b/docs/en-US/cluster-add.xml index 89f9bd2dc9d..3046c5e0dfd 100644 --- a/docs/en-US/cluster-add.xml +++ b/docs/en-US/cluster-add.xml @@ -26,6 +26,6 @@ Adding a Cluster 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. - + diff --git a/docs/en-US/create-template-from-snapshot.xml b/docs/en-US/create-template-from-snapshot.xml index 30750326c9f..80e660fe7c1 100644 --- a/docs/en-US/create-template-from-snapshot.xml +++ b/docs/en-US/create-template-from-snapshot.xml @@ -24,6 +24,6 @@
Creating a Template from a Snapshot - Not supported by Oracle VM + If you do not want to stop the VM in order to use the Create Template menu item (as described in ), you can create a template directly from any snapshot through the &PRODUCT; UI.
diff --git a/docs/en-US/creating-vms.xml b/docs/en-US/creating-vms.xml index dc37dbb38c3..9da4aea94ea 100644 --- a/docs/en-US/creating-vms.xml +++ b/docs/en-US/creating-vms.xml @@ -44,6 +44,6 @@ Click Add Instance. Select ISO Boot, and follow the steps in the wizard. Click Submit and your VM will be created and started. - (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. + diff --git a/docs/en-US/detach-move-volumes.xml b/docs/en-US/detach-move-volumes.xml index a00e15f6cee..25323c928ee 100644 --- a/docs/en-US/detach-move-volumes.xml +++ b/docs/en-US/detach-move-volumes.xml @@ -27,7 +27,7 @@ This procedure is different from moving disk volumes from one storage pool to another. See VM Storage Migration 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. 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. - If the destination VM is running in the OVM hypervisor, the VM must be stopped before a new volume can be attached to it. + Log in to the &PRODUCT; UI as a user or admin. 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. diff --git a/docs/en-US/feature-overview.xml b/docs/en-US/feature-overview.xml index a4178399b10..501bca88c2f 100644 --- a/docs/en-US/feature-overview.xml +++ b/docs/en-US/feature-overview.xml @@ -28,10 +28,7 @@ Multiple Hypervisor Support - &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. - - - &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. Massively Scalable Infrastructure Management diff --git a/docs/en-US/host-add-xenserver-kvm-ovm.xml b/docs/en-US/host-add-xenserver-kvm-ovm.xml index 855177abd24..4bbeefcbed4 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. -->
- Adding a Host (XenServer, KVM, or OVM) - XenServer, KVM, and Oracle VM (OVM) hosts can be added to a cluster at any time. + Adding a Host (XenServer or KVM) + XenServer and KVM hosts can be added to a cluster at any time.
- Requirements for XenServer, KVM, and OVM Hosts + Requirements for XenServer and KVM Hosts Make sure the hypervisor host does not have any VMs already running before you add it to &PRODUCT;. @@ -85,14 +85,14 @@
-
- OVM Host Additional Requirements +
- Adding a XenServer, KVM, or OVM Host + Adding a XenServer or KVM Host If you have not already done so, install the hypervisor software on the host. You will @@ -130,8 +130,8 @@ Username. Usually root. - Password. This is the password for the user named above (from your XenServer, KVM, - or OVM install). + Password. This is the password for the user from your XenServer or KVM + install). Host Tags (Optional). Any labels that you use to categorize hosts for ease of diff --git a/docs/en-US/host-add.xml b/docs/en-US/host-add.xml index 37cf28def63..74509d69be7 100644 --- a/docs/en-US/host-add.xml +++ b/docs/en-US/host-add.xml @@ -39,4 +39,4 @@ -
\ No newline at end of file +
diff --git a/docs/en-US/hypervisor-installation.xml b/docs/en-US/hypervisor-installation.xml index cc6a762027a..b0fc9f46ddb 100644 --- a/docs/en-US/hypervisor-installation.xml +++ b/docs/en-US/hypervisor-installation.xml @@ -27,5 +27,5 @@ - - \ No newline at end of file + + diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml index ca266a43013..055c1826169 100644 --- a/docs/en-US/hypervisor-support-for-primarystorage.xml +++ b/docs/en-US/hypervisor-support-for-primarystorage.xml @@ -40,7 +40,6 @@ VMware vSphere Citrix XenServer KVM - Oracle VM @@ -50,28 +49,24 @@ VMDK VHD QCOW2 - RAW iSCSI support VMFS Clustered LVM Yes, via Shared Mountpoint - Yes, via OCFS2M Fiber Channel support VMFS Yes, via Existing SR Yes, via Shared Mountpoint - No NFS support Y Y Y - Y @@ -79,7 +74,6 @@ Y Y Y - Y @@ -87,7 +81,6 @@ NFS and iSCSI NFS NFS - No @@ -95,8 +88,8 @@ 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. 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 - 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. + 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. - 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. + 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. &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. diff --git a/docs/en-US/manual-live-migration.xml b/docs/en-US/manual-live-migration.xml index 390b41768c8..30a5c11a07f 100644 --- a/docs/en-US/manual-live-migration.xml +++ b/docs/en-US/manual-live-migration.xml @@ -31,7 +31,7 @@ The destination host must be in the same cluster as the original host. The VM must not be using local disk storage. The destination host must have enough available capacity. If not, the VM will remain in the "migrating" state until memory becomes available. - (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. + To manually live migrate a virtual machine diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml index 7c0f15f9cd9..df23715e31c 100644 --- a/docs/en-US/minimum-system-requirements.xml +++ b/docs/en-US/minimum-system-requirements.xml @@ -64,7 +64,7 @@ - + diff --git a/docs/en-US/ovm-requirements.xml b/docs/en-US/ovm-requirements.xml index aadc71f0e2f..70a8920a8ac 100644 --- a/docs/en-US/ovm-requirements.xml +++ b/docs/en-US/ovm-requirements.xml @@ -25,4 +25,4 @@
System Requirements for OVM TODO -
\ No newline at end of file + diff --git a/docs/en-US/release-notes.xml b/docs/en-US/release-notes.xml index a4a2417673c..849dc5af911 100644 --- a/docs/en-US/release-notes.xml +++ b/docs/en-US/release-notes.xml @@ -1254,9 +1254,9 @@ Done restarting router(s). KVM : QCOW2 - +
@@ -2024,6 +2024,13 @@ Done restarting router(s). environment. The functionality is not complete at this time. + + CLOUDSTACK-368 + OVM - cannot create guest VM + This source code release has regressed from the CloudStack 2.2.x code + and is unable to support Oracle VM (OVM). + + CLOUDSTACK-279 Deleting a project fails when executed by the regular user. This works as diff --git a/docs/en-US/runtime-behavior-of-primary-storage.xml b/docs/en-US/runtime-behavior-of-primary-storage.xml index c6563907131..479ebce1ce1 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 @@
Runtime Behavior of Primary Storage - 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. + 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. Data volumes are not deleted when VMs are destroyed. Administrators should monitor the capacity of primary storage devices and add additional primary storage as needed. See the Advanced Installation Guide. Administrators add primary storage to the system by creating a &PRODUCT; storage pool. Each storage pool is associated with a cluster.
diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml index 5966ce68de1..86dc8e54758 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 @@ KVM QCOW2 - + diff --git a/docs/en-US/upload-template.xml b/docs/en-US/upload-template.xml index 51aeb5a63c9..40b64bbe8aa 100644 --- a/docs/en-US/upload-template.xml +++ b/docs/en-US/upload-template.xml @@ -24,7 +24,7 @@
Uploading Templates - 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. + vSphere Templates and ISOsIf 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. 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. To upload a template: @@ -39,7 +39,7 @@ If the operating system of the stopped VM is listed, choose it. If the OS type of the stopped VM is not listed, choose Other. - 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. + 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. Hypervisor diff --git a/docs/en-US/working-with-snapshots.xml b/docs/en-US/working-with-snapshots.xml index 6145ffd8de1..d6b145875d4 100644 --- a/docs/en-US/working-with-snapshots.xml +++ b/docs/en-US/working-with-snapshots.xml @@ -25,8 +25,8 @@
Working with Snapshots (Supported for the following hypervisors: XenServer, VMware vSphere, and KVM) - &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. - 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. + &PRODUCT; supports snapshots of disk volumes. Snapshots are a point-in-time capture of virtual machine disks. Memory and CPU states are not captured. + 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. 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. A completed snapshot is copied from primary storage to secondary storage, where it is stored until deleted or purged by newer snapshot.
diff --git a/docs/en-US/working-with-volumes.xml b/docs/en-US/working-with-volumes.xml index 8aa04205488..117912015d2 100644 --- a/docs/en-US/working-with-volumes.xml +++ b/docs/en-US/working-with-volumes.xml @@ -31,7 +31,7 @@ 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. &PRODUCT; defines a volume as a unit of storage available to a guest