My apologies for applying to this branch - I'll revert shortly. --David
On Wed, Oct 17, 2012 at 6:32 PM, <ke4...@apache.org> wrote: > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c24bc002/docs/en-US/management-server-install-systemvm.xml > ---------------------------------------------------------------------- > diff --git a/docs/en-US/management-server-install-systemvm.xml > b/docs/en-US/management-server-install-systemvm.xml > index c2c1212..711bcba 100644 > --- a/docs/en-US/management-server-install-systemvm.xml > +++ b/docs/en-US/management-server-install-systemvm.xml > @@ -21,36 +21,53 @@ > specific language governing permissions and limitations > under the License. > --> > - > <section id="prepare-system-vm-template"> > - <title>Prepare the System VM Template</title> > - <para>Secondary storage must be seeded with a template that is used for > &PRODUCT; system VMs.</para> > - <note><para>When copying and pasting a command, be sure the command has > pasted as a single line before executing. Some document viewers may introduce > unwanted line breaks in copied text.</para></note> > - <orderedlist> > - <listitem><para>On the Management Server, run one or more of the > following cloud-install-sys-tmplt commands to retrieve and decompress the > system VM template. Run the command for each hypervisor type that you expect > end users to run in this Zone.</para> > - <para>If your secondary storage mount point is not named > /mnt/secondary, substitute your own mount point name.</para> > - <para>If you set the &PRODUCT; database encryption type to "web" > when you set up the database, you must now add the parameter -s > <management-server-secret-key>. See About Password and Key > Encryption.</para> > - <para>This process will require approximately 5 GB of free space > on the local file system and up to 30 minutes each time it runs.</para> > - <itemizedlist> > - <listitem><para>For XenServer:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h > xenserver -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - <listitem><para>For vSphere:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h > vmware -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - <listitem><para>For KVM:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 > -h kvm -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - </itemizedlist> > + <title>Prepare the System VM Template</title> > + <para>Secondary storage must be seeded with a template that is used for > &PRODUCT; system > + VMs.</para> > + <note> > + <para>When copying and pasting a command, be sure the command has pasted > as a single line before > + executing. Some document viewers may introduce unwanted line breaks in > copied text.</para> > + </note> > + <orderedlist> > + <listitem> > + <para>On the Management Server, run one or more of the following > cloud-install-sys-tmplt > + commands to retrieve and decompress the system VM template. Run the > command for each > + hypervisor type that you expect end users to run in this Zone.</para> > + <para>If your secondary storage mount point is not named > /mnt/secondary, substitute your own > + mount point name.</para> > + <para>If you set the &PRODUCT; database encryption type to "web" when > you set up the database, > + you must now add the parameter -s > <management-server-secret-key>. See About Password > + and Key Encryption.</para> > + <para>This process will require approximately 5 GB of free space on > the local file system and > + up to 30 minutes each time it runs.</para> > + <itemizedlist> > + <listitem> > + <para>For XenServer:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h > xenserver -s <optional-management-server-secret-key> -F</programlisting> > + </listitem> > + <listitem> > + <para>For vSphere:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h > vmware -s <optional-management-server-secret-key> -F</programlisting> > + </listitem> > + <listitem> > + <para>For KVM:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 > -h kvm -s <optional-management-server-secret-key> -F</programlisting> > </listitem> > - <listitem><para>If you are using a separate NFS server, perform this > step. If you are using the Management Server as the NFS server, you MUST NOT > perform this step.</para> > - <para>When the script has finished, unmount secondary storage > and remove the created directory.</para> > - <programlisting> > + </itemizedlist> > + </listitem> > + <listitem> > + <para>If you are using a separate NFS server, perform this step. If > you are using the > + Management Server as the NFS server, you MUST NOT perform this > step.</para> > + <para>When the script has finished, unmount secondary storage and > remove the created > + directory.</para> > + <programlisting> > # umount /mnt/secondary > # rmdir /mnt/secondary > </programlisting> > - </listitem> > - <listitem><para>Repeat these steps for each secondary storage > server.</para> > - </listitem> > - </orderedlist> > + </listitem> > + <listitem> > + <para>Repeat these steps for each secondary storage server.</para> > + </listitem> > + </orderedlist> > </section> > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c24bc002/docs/en-US/prepare-system-vm-template.xml > ---------------------------------------------------------------------- > diff --git a/docs/en-US/prepare-system-vm-template.xml > b/docs/en-US/prepare-system-vm-template.xml > index 160cea4..a9872cd 100644 > --- a/docs/en-US/prepare-system-vm-template.xml > +++ b/docs/en-US/prepare-system-vm-template.xml > @@ -1,5 +1,5 @@ > <?xml version='1.0' encoding='utf-8' ?> > -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" > "file:///C:/Program%20Files%20(x86)/Publican/DocBook_DTD/docbookx.dtd" [ > +<!DOCTYPE bookinfo 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; > ]> > @@ -21,37 +21,53 @@ > specific language governing permissions and limitations > under the License. > --> > - > <section id="prepare-system-vm-template"> > - <title>Prepare the System VM Template</title> > - <para>Secondary storage must be seeded with a template that is used > for &PRODUCT; system VMs.</para> > - <note><para>When copying and pasting a command, be sure the command > has pasted as a single line before executing. Some document viewers may > introduce unwanted line breaks in copied text.</para></note> > - <orderedlist> > - <listitem><para>On the Management Server, run one or more of > the following cloud-install-sys-tmplt commands to retrieve and decompress the > system VM template. Run the command for each hypervisor type that you expect > end users to run in this Zone.</para> > - <para>If your secondary storage mount point is not > named /mnt/secondary, substitute your own mount point name.</para> > - <para>If you set the &PRODUCT; database encryption > type to "web" when you set up the database, you must now add the parameter -s > <management-server-secret-key>. See About Password and Key > Encryption.</para> > - <para>This process will require approximately 5 GB of > free space on the local file system and up to 30 minutes each time it > runs.</para> > - <itemizedlist> > - <listitem><para>For XenServer:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h > xenserver -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - <listitem><para>For vSphere:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.ova -h > vmware -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - <listitem><para>For KVM:</para> > - <programlisting># > /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 > -h kvm -s <optional-management-server-secret-key> -F</programlisting> > - </listitem> > - </itemizedlist> > - </listitem> > - <listitem><para>If you are using a separate NFS server, > perform this step. If you are using the Management > - Server as the NFS server, you MUST NOT > perform this step.</para> > - <para>When the script has finished, unmount secondary > storage and remove the created directory.</para> > - <programlisting> > + <title>Prepare the System VM Template</title> > + <para>Secondary storage must be seeded with a template that is used for > &PRODUCT; system > + VMs.</para> > + <note> > + <para>When copying and pasting a command, be sure the command has pasted > as a single line before > + executing. Some document viewers may introduce unwanted line breaks in > copied text.</para> > + </note> > + <orderedlist> > + <listitem> > + <para>On the Management Server, run one or more of the following > cloud-install-sys-tmplt > + commands to retrieve and decompress the system VM template. Run the > command for each > + hypervisor type that you expect end users to run in this Zone.</para> > + <para>If your secondary storage mount point is not named > /mnt/secondary, substitute your own > + mount point name.</para> > + <para>If you set the &PRODUCT; database encryption type to "web" when > you set up the database, > + you must now add the parameter -s > <management-server-secret-key>. See About Password > + and Key Encryption.</para> > + <para>This process will require approximately 5 GB of free space on > the local file system and > + up to 30 minutes each time it runs.</para> > + <itemizedlist> > + <listitem> > + <para>For XenServer:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h > xenserver -s <optional-management-server-secret-key> -F</programlisting> > + </listitem> > + <listitem> > + <para>For vSphere:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.ova -h > vmware -s <optional-management-server-secret-key> -F</programlisting> > + </listitem> > + <listitem> > + <para>For KVM:</para> > + <programlisting># > /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m > /mnt/secondary -u > http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 > -h kvm -s <optional-management-server-secret-key> -F</programlisting> > + </listitem> > + </itemizedlist> > + </listitem> > + <listitem> > + <para>If you are using a separate NFS server, perform this step. If > you are using the > + Management Server as the NFS server, you MUST NOT perform this > step.</para> > + <para>When the script has finished, unmount secondary storage and > remove the created > + directory.</para> > + <programlisting> > # umount /mnt/secondary > # rmdir /mnt/secondary > </programlisting> > - </listitem> > - <listitem><para>Repeat these steps for each secondary storage > server.</para> > - </listitem> > - </orderedlist> > + </listitem> > + <listitem> > + <para>Repeat these steps for each secondary storage server.</para> > + </listitem> > + </orderedlist> > </section> >
