CLOUDSTACK-3300: little fix for doc build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a12a13cc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a12a13cc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a12a13cc Branch: refs/heads/vmsync Commit: a12a13ccc9f5969d21774bcfa10a6c60c65a3bde Parents: b68cc33 Author: Sebastien Goasguen <run...@gmail.com> Authored: Mon Jul 1 06:33:16 2013 -0400 Committer: Sebastien Goasguen <run...@gmail.com> Committed: Mon Jul 1 06:33:16 2013 -0400 ---------------------------------------------------------------------- docs/en-US/upload-existing-volume-to-vm.xml | 53 ------------------------ 1 file changed, 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a12a13cc/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 6be43f8..4681374 100644 --- a/docs/en-US/upload-existing-volume-to-vm.xml +++ b/docs/en-US/upload-existing-volume-to-vm.xml @@ -22,58 +22,6 @@ under the License. --> <section id="upload-existing-volume-to-vm"> -<<<<<<< HEAD - <title>Uploading an Existing Volume to a Virtual Machine</title> - <para>Existing data can be made accessible to a virtual machine. This is called uploading a volume to the VM. For example, this is useful to upload data from a local file system and attach it to a VM. Root administrators, domain administrators, and end users can all upload existing volumes to VMs.</para> - <para>The upload is performed using HTTP. The uploaded volume is placed in the zone's secondary storage</para> - <para>You cannot upload a volume if the preconfigured volume limit has already been reached. The default limit for the cloud is set in the global configuration parameter max.account.volumes, but administrators can also set per-domain limits that are different from the global default. See Setting Usage Limits </para> - <para>To upload a volume:</para> - <orderedlist> - <listitem id="optional-hash"><para>(Optional) Create an MD5 hash (checksum) of the disk image file that you are going to upload. After uploading the data disk, &PRODUCT; will use this value to verify that no data corruption has occurred.</para></listitem> - <listitem><para>Log in to the &PRODUCT; UI as an administrator or user</para></listitem> - <listitem><para>In the left navigation bar, click Storage.</para></listitem> - <listitem><para>Click Upload Volume.</para></listitem> - <listitem><para>Provide the following:</para> - <itemizedlist> - <listitem><para>Name and Description. Any desired name and a brief description that can be shown in the UI.</para></listitem> - <listitem><para>Availability Zone. Choose the zone where you want to store the volume. VMs running on hosts in this zone can attach the volume.</para></listitem> - <listitem><para>Format. Choose one of the following to indicate the disk image format of the volume.</para> - <informaltable> - <tgroup cols="2" align="left" colsep="1" rowsep="1"> - <thead> - <row> - <entry><para>Hypervisor</para></entry> - <entry><para>Disk Image Format</para></entry> - </row> - </thead> - <tbody> - <row> - <entry><para>XenServer</para></entry> - <entry><para>VHD</para></entry> - </row> - <row> - <entry><para>VMware</para></entry> - <entry><para>OVA</para></entry> - </row> - <row> - <entry><para>KVM</para></entry> - <entry><para>QCOW2</para></entry> - </row> - <!-- <row> - <entry><para>OVM</para></entry> - <entry><para>RAW</para></entry> - </row> --> - </tbody> - </tgroup> - </informaltable></listitem> - <listitem><para>URL. The secure HTTP or HTTPS URL that &PRODUCT; can use to access your disk. The type of file at the URL must match the value chosen in Format. For example, if Format is VHD, the URL might look like the following:</para> - <para>http://yourFileServerIP/userdata/myDataDisk.vhd</para></listitem> - <listitem><para>MD5 checksum. (Optional) Use the hash that you created in step <xref linkend="optional-hash"/>.</para></listitem> - </itemizedlist> - </listitem> - <listitem><para>Wait until the status of the volume shows that the upload is complete. Click Instances - Volumes, find the name you specified in step <xref linkend="optional-hash"/>, and make sure the status is Uploaded.</para></listitem> - </orderedlist> -======= <title>Uploading an Existing Volume to a Virtual Machine</title> <para>Existing data can be made accessible to a virtual machine. This is called uploading a volume to the VM. For example, this is useful to upload data from a local file system and attach it to @@ -160,5 +108,4 @@ Volumes, find the name you specified in step 5, and make sure the status is Uploaded.</para> </listitem> </orderedlist> ->>>>>>> 9cb9f45... CLOUDSTACK-1313 </section>
