You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/08/11 23:10:17 UTC
[11/11] docs: Fix indentation according to coding convention
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/using-multiple-guest-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-multiple-guest-networks.xml b/docs/en-US/using-multiple-guest-networks.xml
index 1ff0804..8d3588a 100644
--- a/docs/en-US/using-multiple-guest-networks.xml
+++ b/docs/en-US/using-multiple-guest-networks.xml
@@ -4,9 +4,9 @@
%BOOK_ENTITIES;
]>
<section id="using-multiple-guest-networks">
- <title>Using Multiple Guest Networks</title>
- <para>In zones that use advanced networking, additional networks for guest traffic may be added at any time after the initial installation. You can also customize the domain name associated with the network by specifying a DNS suffix for each network.</para>
- <para>A VM's networks are defined at VM creation time. A VM cannot add or remove networks after it has been created, although the user can go into the guest and remove the IP address from the NIC on a particular network.</para>
- <para>Each VM has just one default network. The virtual router's DHCP reply will set the guest's default gateway as that for the default network. Multiple non-default networks may be added to a guest in addition to the single, required default network. The administrator can control which networks are available as the default network.</para>
- <para>Additional networks can either be available to all accounts or be assigned to a specific account. Networks that are available to all accounts are zone-wide. Any user with access to the zone can create a VM with access to that network. These zone-wide networks provide little or no isolation between guests. Networks that are assigned to a specific account provide strong isolation.</para>
+ <title>Using Multiple Guest Networks</title>
+ <para>In zones that use advanced networking, additional networks for guest traffic may be added at any time after the initial installation. You can also customize the domain name associated with the network by specifying a DNS suffix for each network.</para>
+ <para>A VM's networks are defined at VM creation time. A VM cannot add or remove networks after it has been created, although the user can go into the guest and remove the IP address from the NIC on a particular network.</para>
+ <para>Each VM has just one default network. The virtual router's DHCP reply will set the guest's default gateway as that for the default network. Multiple non-default networks may be added to a guest in addition to the single, required default network. The administrator can control which networks are available as the default network.</para>
+ <para>Additional networks can either be available to all accounts or be assigned to a specific account. Networks that are available to all accounts are zone-wide. Any user with access to the zone can create a VM with access to that network. These zone-wide networks provide little or no isolation between guests. Networks that are assigned to a specific account provide strong isolation.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/using-netscaler-load-balancers.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-netscaler-load-balancers.xml b/docs/en-US/using-netscaler-load-balancers.xml
index 61fb6fa..0003c36 100644
--- a/docs/en-US/using-netscaler-load-balancers.xml
+++ b/docs/en-US/using-netscaler-load-balancers.xml
@@ -38,5 +38,5 @@
</tbody>
</tgroup>
</informaltable>
-
- </section>
+
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/using-swift-for-secondary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-swift-for-secondary-storage.xml b/docs/en-US/using-swift-for-secondary-storage.xml
index a3b873b..bdeba0d 100644
--- a/docs/en-US/using-swift-for-secondary-storage.xml
+++ b/docs/en-US/using-swift-for-secondary-storage.xml
@@ -4,8 +4,8 @@
%BOOK_ENTITIES;
]>
<section id="using-swift-for-secondary-storage">
- <title>Using Swift for Secondary Storage</title>
- <para>CloudPlatform supports OpenStack Object Storage (<ulink url="http://swift.openstack.org/"> Swift</ulink>) for secondary storage. When using Swift, you configure Swift storage for the entire CloudPlatform, then set up NFS secondary storage for each zone as usual. The NFS storage in each zone acts as a staging area through which all templates and other secondary storage data pass before being forwarded to Swift. The Swift storage acts as a cloud-wide resource, making templates and other data available to any zone in the cloud. There is no hierarchy in the Swift storage, just one Swift container per storage object. Any secondary storage in the whole cloud can pull a container from Swift at need. It is not necessary to copy templates and snapshots from one zone to another, as would be required when using zone NFS alone. Everything is available everywhere</para>
- <para>Swift storage must be set up before you add NFS secondary storage to zones. This is accomplished through some additional configuration steps on a fresh Management Server installation, before you add the first zone. The procedure is described in Adding a Zone in the Advanced Installation Guide.</para>
- </section>
+ <title>Using Swift for Secondary Storage</title>
+ <para>CloudPlatform supports OpenStack Object Storage (<ulink url="http://swift.openstack.org/"> Swift</ulink>) for secondary storage. When using Swift, you configure Swift storage for the entire CloudPlatform, then set up NFS secondary storage for each zone as usual. The NFS storage in each zone acts as a staging area through which all templates and other secondary storage data pass before being forwarded to Swift. The Swift storage acts as a cloud-wide resource, making templates and other data available to any zone in the cloud. There is no hierarchy in the Swift storage, just one Swift container per storage object. Any secondary storage in the whole cloud can pull a container from Swift at need. It is not necessary to copy templates and snapshots from one zone to another, as would be required when using zone NFS alone. Everything is available everywhere</para>
+ <para>Swift storage must be set up before you add NFS secondary storage to zones. This is accomplished through some additional configuration steps on a fresh Management Server installation, before you add the first zone. The procedure is described in Adding a Zone in the Advanced Installation Guide.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/using-vpn-with-mac.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-vpn-with-mac.xml b/docs/en-US/using-vpn-with-mac.xml
index 0104d85..e6412f5 100644
--- a/docs/en-US/using-vpn-with-mac.xml
+++ b/docs/en-US/using-vpn-with-mac.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<section id="using-vpn-with-mac">
- <title>Using VPN with Mac OS X</title>
- <para>In Mac OS X, in Network Preferences – Advanced, make sure Send all traffic over VPN connection is not checked.</para>
- </section>
+ <title>Using VPN with Mac OS X</title>
+ <para>In Mac OS X, in Network Preferences – Advanced, make sure Send all traffic over VPN connection is not checked.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/using-vpn-with-windows.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-vpn-with-windows.xml b/docs/en-US/using-vpn-with-windows.xml
index 77389f9..a1b6f41 100644
--- a/docs/en-US/using-vpn-with-windows.xml
+++ b/docs/en-US/using-vpn-with-windows.xml
@@ -4,20 +4,20 @@
%BOOK_ENTITIES;
]>
<section id="using-vpn-with-windows">
- <title>Using VPN with Windows</title>
- <para>The procedure to use VPN varies by Windows version. Generally, the user must edit the VPN properties and make sure that the default route is not the VPN. The following steps are for Windows L2TP clients on Windows Vista. The commands should be similar for other Windows versions.</para>
- <orderedlist>
- <listitem><para>Log in to the CloudPlatform UI and click on the source NAT IP for the account. The VPN tab should display the IPsec preshared key. Make a note of this and the source NAT IP. The UI also lists one or more users and their passwords. Choose one of these users, or, if none exists, add a user and password.</para></listitem>
- <listitem><para>On the Windows box, go to Control Panel, then select Network and Sharing center. Click Setup a connection or network.</para></listitem>
- <listitem><para>In the next dialog, select No, create a new connection.</para></listitem>
- <listitem><para>In the next dialog, select Use my Internet Connection (VPN).</para></listitem>
- <listitem><para>In the next dialog, enter the source NAT IP from step 1 and give the connection a name. Check Don't connect now.</para></listitem>
- <listitem><para>In the next dialog, enter the user name and password selected in step 1.</para></listitem>
- <listitem><para>Click Create.</para></listitem>
- <listitem><para>Go back to the Control Panel and click Network Connections to see the new connection. The connection is not active yet.</para></listitem>
- <listitem><para>Right-click the new connection and select Properties. In the Properties dialog, select the Networking tab.</para></listitem>
- <listitem><para>In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings. Select Use preshared key. Enter the preshared key from Step 1.</para></listitem>
- <listitem><para>The connection is ready for activation. Go back to Control Panel -> Network Connections and double-click the created connection.</para></listitem>
- <listitem><para>Enter the user name and password from Step 1.</para></listitem>
- </orderedlist>
+ <title>Using VPN with Windows</title>
+ <para>The procedure to use VPN varies by Windows version. Generally, the user must edit the VPN properties and make sure that the default route is not the VPN. The following steps are for Windows L2TP clients on Windows Vista. The commands should be similar for other Windows versions.</para>
+ <orderedlist>
+ <listitem><para>Log in to the CloudPlatform UI and click on the source NAT IP for the account. The VPN tab should display the IPsec preshared key. Make a note of this and the source NAT IP. The UI also lists one or more users and their passwords. Choose one of these users, or, if none exists, add a user and password.</para></listitem>
+ <listitem><para>On the Windows box, go to Control Panel, then select Network and Sharing center. Click Setup a connection or network.</para></listitem>
+ <listitem><para>In the next dialog, select No, create a new connection.</para></listitem>
+ <listitem><para>In the next dialog, select Use my Internet Connection (VPN).</para></listitem>
+ <listitem><para>In the next dialog, enter the source NAT IP from step 1 and give the connection a name. Check Don't connect now.</para></listitem>
+ <listitem><para>In the next dialog, enter the user name and password selected in step 1.</para></listitem>
+ <listitem><para>Click Create.</para></listitem>
+ <listitem><para>Go back to the Control Panel and click Network Connections to see the new connection. The connection is not active yet.</para></listitem>
+ <listitem><para>Right-click the new connection and select Properties. In the Properties dialog, select the Networking tab.</para></listitem>
+ <listitem><para>In Type of VPN, choose L2TP IPsec VPN, then click IPsec settings. Select Use preshared key. Enter the preshared key from Step 1.</para></listitem>
+ <listitem><para>The connection is ready for activation. Go back to Control Panel -> Network Connections and double-click the created connection.</para></listitem>
+ <listitem><para>Enter the user name and password from Step 1.</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/virtual-machine-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/virtual-machine-usage-record-format.xml b/docs/en-US/virtual-machine-usage-record-format.xml
index 9df22f0..5fe75c9 100644
--- a/docs/en-US/virtual-machine-usage-record-format.xml
+++ b/docs/en-US/virtual-machine-usage-record-format.xml
@@ -1,22 +1,22 @@
<section id="virtual-machine-usage-record-format">
- <title>Virtual Machine Usage Record Format</title>
- <para>For running and allocated virtual machine usage, the following fields exist in a usage record:</para>
- <itemizedlist>
- <listitem><para>account – name of the account</para></listitem>
- <listitem><para>accountid – ID of the account</para></listitem>
- <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
- <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
- <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
- <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for VM running time)</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
- <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
- <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
- <listitem><para>name – The name of the virtual machine</para></listitem>
- <listitem><para>offeringid – The ID of the service offering</para></listitem>
- <listitem><para>templateid – The ID of the template or the ID of the parent template. The parent template value is present when the current template was created from a volume.</para></listitem>
- <listitem><para>usageid – Virtual machine</para></listitem>
- <listitem><para>type – Hypervisor</para></listitem>
- <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
- </itemizedlist>
+ <title>Virtual Machine Usage Record Format</title>
+ <para>For running and allocated virtual machine usage, the following fields exist in a usage record:</para>
+ <itemizedlist>
+ <listitem><para>account – name of the account</para></listitem>
+ <listitem><para>accountid – ID of the account</para></listitem>
+ <listitem><para>domainid – ID of the domain in which this account resides</para></listitem>
+ <listitem><para>zoneid – Zone where the usage occurred</para></listitem>
+ <listitem><para>description – A string describing what the usage record is tracking</para></listitem>
+ <listitem><para>usage – String representation of the usage, including the units of usage (e.g. 'Hrs' for VM running time)</para></listitem>
+ <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
+ <listitem><para>rawusage – A number representing the actual usage in hours</para></listitem>
+ <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
+ <listitem><para>name – The name of the virtual machine</para></listitem>
+ <listitem><para>offeringid – The ID of the service offering</para></listitem>
+ <listitem><para>templateid – The ID of the template or the ID of the parent template. The parent template value is present when the current template was created from a volume.</para></listitem>
+ <listitem><para>usageid – Virtual machine</para></listitem>
+ <listitem><para>type – Hypervisor</para></listitem>
+ <listitem><para>startdate, enddate – The range of time for which the usage is aggregated; see Dates in the Usage Record</para></listitem>
+ </itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/vm-lifecycle.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vm-lifecycle.xml b/docs/en-US/vm-lifecycle.xml
index 83e1845..3499c4b 100644
--- a/docs/en-US/vm-lifecycle.xml
+++ b/docs/en-US/vm-lifecycle.xml
@@ -1,20 +1,20 @@
<section id="vm-lifecycle">
- <title>VM Lifecycle</title>
- <para>Virtual machines can be in the following states:</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/basic-deployment.png" />
- </imageobject>
- <textobject><phrase>basic-deployment.png: Basic two-machine CloudStack deployment</phrase></textobject>
- </mediaobject>
- <para>Once a virtual machine is destroyed, it cannot be recovered. All the resources used by the virtual machine will be reclaimed by the system. This includes the virtual machine’s IP address.</para>
- <para>A stop will attempt to gracefully shut down the operating system, which typically involves terminating all the running applications. If the operation system cannot be stopped, it will be forcefully terminated. This has the same effect as pulling the power cord to a physical machine.</para>
- <para>A reboot is a stop followed by a start.</para>
- <para>CloudPlatform preserves the state of the virtual machine hard disk until the machine is destroyed.</para>
- <para>A running virtual machine may fail because of hardware or network issues. A failed virtual machine is in the down state.</para>
- <para>The system places the virtual machine into the down state if it does not receive the heartbeat from the hypervisor for three minutes.</para>
- <para>The user can manually restart the virtual machine from the down state.</para>
- <para>The system will start the virtual machine from the down state automatically if the virtual machine is marked as HA-enabled.</para>
-
+ <title>VM Lifecycle</title>
+ <para>Virtual machines can be in the following states:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/basic-deployment.png" />
+ </imageobject>
+ <textobject><phrase>basic-deployment.png: Basic two-machine CloudStack deployment</phrase></textobject>
+ </mediaobject>
+ <para>Once a virtual machine is destroyed, it cannot be recovered. All the resources used by the virtual machine will be reclaimed by the system. This includes the virtual machine’s IP address.</para>
+ <para>A stop will attempt to gracefully shut down the operating system, which typically involves terminating all the running applications. If the operation system cannot be stopped, it will be forcefully terminated. This has the same effect as pulling the power cord to a physical machine.</para>
+ <para>A reboot is a stop followed by a start.</para>
+ <para>CloudPlatform preserves the state of the virtual machine hard disk until the machine is destroyed.</para>
+ <para>A running virtual machine may fail because of hardware or network issues. A failed virtual machine is in the down state.</para>
+ <para>The system places the virtual machine into the down state if it does not receive the heartbeat from the hypervisor for three minutes.</para>
+ <para>The user can manually restart the virtual machine from the down state.</para>
+ <para>The system will start the virtual machine from the down state automatically if the virtual machine is marked as HA-enabled.</para>
+
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/vm-storage-migration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vm-storage-migration.xml b/docs/en-US/vm-storage-migration.xml
index fdbbba0..885be2c 100644
--- a/docs/en-US/vm-storage-migration.xml
+++ b/docs/en-US/vm-storage-migration.xml
@@ -5,11 +5,11 @@
]>
<section id="vm-storage-migration">
<title>VM Storage Migration</title>
- <para>Supported in XenServer, KVM, and VMware.</para>
+ <para>Supported in XenServer, KVM, and VMware.</para>
<note><para>This procedure is different from moving disk volumes from one VM to another. See Detaching and Moving Volumes <xref linkend="detach-move-volumes" />.</para></note>
- <para>You can migrate a virtual machine’s root disk volume or any additional data disk volume from one storage pool to another in the same zone.</para>
- <para>You can use the storage migration feature to achieve some commonly desired administration goals, such as balancing the load on storage pools and increasing the reliability of virtual machines by moving them away from any storage pool that is experiencing issues.</para>
+ <para>You can migrate a virtual machine’s root disk volume or any additional data disk volume from one storage pool to another in the same zone.</para>
+ <para>You can use the storage migration feature to achieve some commonly desired administration goals, such as balancing the load on storage pools and increasing the reliability of virtual machines by moving them away from any storage pool that is experiencing issues.</para>
<xi:include href="migrate-datadisk-volume-new-storage-pool.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="migrate-vm-rootvolume-volume-new-storage-pool.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </section>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/volume-deletion-garbage-collection.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/volume-deletion-garbage-collection.xml b/docs/en-US/volume-deletion-garbage-collection.xml
index 9f50ac5..80ab0d1 100644
--- a/docs/en-US/volume-deletion-garbage-collection.xml
+++ b/docs/en-US/volume-deletion-garbage-collection.xml
@@ -4,14 +4,14 @@
%BOOK_ENTITIES;
]>
<section id="volume-deletion-garbage-collection">
- <title>Volume Deletion and Garbage Collection</title>
- <para>The deletion of a volume does not delete the snapshots that have been created from the volume</para>
- <para>When a VM is destroyed, data disk volumes that are attached to the VM are not deleted.</para>
- <para>Volumes are permanently destroyed using a garbage collection process. The global configuration variables expunge.delay and expunge.interval determine when the physical deletion of volumes will occur.</para>
- <itemizedlist>
- <listitem><para>expunge.delay: determines how old the volume must be before it is destroyed, in seconds</para></listitem>
- <listitem><para>expunge.interval: determines how often to run the garbage collection check</para></listitem>
- </itemizedlist>
- <para>Administrators should adjust these values depending on site policies around data retention.</para>
- </section>
+ <title>Volume Deletion and Garbage Collection</title>
+ <para>The deletion of a volume does not delete the snapshots that have been created from the volume</para>
+ <para>When a VM is destroyed, data disk volumes that are attached to the VM are not deleted.</para>
+ <para>Volumes are permanently destroyed using a garbage collection process. The global configuration variables expunge.delay and expunge.interval determine when the physical deletion of volumes will occur.</para>
+ <itemizedlist>
+ <listitem><para>expunge.delay: determines how old the volume must be before it is destroyed, in seconds</para></listitem>
+ <listitem><para>expunge.interval: determines how often to run the garbage collection check</para></listitem>
+ </itemizedlist>
+ <para>Administrators should adjust these values depending on site policies around data retention.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/volume-status.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/volume-status.xml b/docs/en-US/volume-status.xml
index 88f3717..a0ec102 100644
--- a/docs/en-US/volume-status.xml
+++ b/docs/en-US/volume-status.xml
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<section id="volume-status">
- <title>Volume Status</title>
- <para>When a snapshot operation is triggered by means of a recurring snapshot policy, a snapshot is skipped if a volume has remained inactive since its last snapshot was taken. A volume is considered to be inactive if it is either detached or attached to a VM that is not running. CloudPlatform ensures that at least one snapshot is taken since the volume last became inactive.</para>
- <para>When a snapshot is taken manually, a snapshot is always created regardless of whether a volume has been active or not.</para>
- </section>
+ <title>Volume Status</title>
+ <para>When a snapshot operation is triggered by means of a recurring snapshot policy, a snapshot is skipped if a volume has remained inactive since its last snapshot was taken. A volume is considered to be inactive if it is either detached or attached to a VM that is not running. CloudPlatform ensures that at least one snapshot is taken since the volume last became inactive.</para>
+ <para>When a snapshot is taken manually, a snapshot is always created regardless of whether a volume has been active or not.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vpn.xml b/docs/en-US/vpn.xml
index 31b7a64..0eafa94 100644
--- a/docs/en-US/vpn.xml
+++ b/docs/en-US/vpn.xml
@@ -4,19 +4,19 @@
%BOOK_ENTITIES;
]>
<section id="vpn">
- <title>VPN</title>
- <para>CloudPlatform account owners can create virtual private networks (VPN) to access their virtual machines. If the guest network is instantiated from a network offering that offers the Remote Access VPN service, the virtual router (based on the System VM) is used to provide the service. CloudPlatform provides a L2TP-over-IPsec-based remote access VPN service to guest virtual networks. Since each network gets its own virtual router, VPNs are not shared across the networks. VPN clients native to Windows, Mac OS X and iOS can be used to connect to the guest networks. The account owner can create and manage users for their VPN. CloudPlatform does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.</para>
- <note><para>Make sure that not all traffic goes through the VPN. That is, the route installed by the VPN should be only for the guest network and not for all traffic.</para></note>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Road Warrior / Remote Access</emphasis>. Users want to be able to
- connect securely from a home or office to a private network in the cloud. Typically,
- the IP address of the connecting client is dynamic and cannot be preconfigured on
- the VPN server.</para></listitem>
- <listitem><para><emphasis role="bold">Site to Site</emphasis>. In this scenario, two private subnets are
- connected over the public Internet with a secure VPN tunnel. The cloud user’s subnet
- (for example, an office network) is connected through a gateway to the network in
- the cloud. The address of the user’s gateway must be preconfigured on the VPN server
- in the cloud. Note that although L2TP-over-IPsec can be used to set up Site-to-Site
- VPNs, this is not the primary intent of this feature.</para></listitem>
- </itemizedlist>
+ <title>VPN</title>
+ <para>CloudPlatform account owners can create virtual private networks (VPN) to access their virtual machines. If the guest network is instantiated from a network offering that offers the Remote Access VPN service, the virtual router (based on the System VM) is used to provide the service. CloudPlatform provides a L2TP-over-IPsec-based remote access VPN service to guest virtual networks. Since each network gets its own virtual router, VPNs are not shared across the networks. VPN clients native to Windows, Mac OS X and iOS can be used to connect to the guest networks. The account owner can create and manage users for their VPN. CloudPlatform does not use its account database for this purpose but uses a separate table. The VPN user database is shared across all the VPNs created by the account owner. All VPN users get access to all VPNs created by the account owner.</para>
+ <note><para>Make sure that not all traffic goes through the VPN. That is, the route installed by the VPN should be only for the guest network and not for all traffic.</para></note>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Road Warrior / Remote Access</emphasis>. Users want to be able to
+ connect securely from a home or office to a private network in the cloud. Typically,
+ the IP address of the connecting client is dynamic and cannot be preconfigured on
+ the VPN server.</para></listitem>
+ <listitem><para><emphasis role="bold">Site to Site</emphasis>. In this scenario, two private subnets are
+ connected over the public Internet with a secure VPN tunnel. The cloud user’s subnet
+ (for example, an office network) is connected through a gateway to the network in
+ the cloud. The address of the user’s gateway must be preconfigured on the VPN server
+ in the cloud. Note that although L2TP-over-IPsec can be used to set up Site-to-Site
+ VPNs, this is not the primary intent of this feature.</para></listitem>
+ </itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/whatis.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/whatis.xml b/docs/en-US/whatis.xml
index 89348c5..d89d874 100644
--- a/docs/en-US/whatis.xml
+++ b/docs/en-US/whatis.xml
@@ -4,23 +4,23 @@
%BOOK_ENTITIES;
]>
<section id="whatis">
- <title>What Is &PRODUCT;?</title>
- <para>
- &PRODUCT; is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. &PRODUCT; manages the network, storage, and compute nodes that make up a cloud infrastructure. Use &PRODUCT; to deploy, manage, and configure cloud computing environments.
- </para>
- <para>Typical users are service providers and enterprises. With &PRODUCT;, you can:</para>
- <itemizedlist>
- <listitem>
- <para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.
- </para></listitem>
- <listitem>
- <para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with &PRODUCT; an enterprise can offer self-service virtual machines to users without involving IT departments.
- </para></listitem>
- </itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/1000-foot-view.png" />
- </imageobject>
- <textobject><phrase>1000-foot-view.png: Overview of &PRODUCT;</phrase></textobject>
- </mediaobject>
+ <title>What Is &PRODUCT;?</title>
+ <para>
+ &PRODUCT; is an open source software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. &PRODUCT; manages the network, storage, and compute nodes that make up a cloud infrastructure. Use &PRODUCT; to deploy, manage, and configure cloud computing environments.
+ </para>
+ <para>Typical users are service providers and enterprises. With &PRODUCT;, you can:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Set up an on-demand, elastic cloud computing service. Service providers can sell self service virtual machine instances, storage volumes, and networking configurations over the Internet.
+ </para></listitem>
+ <listitem>
+ <para>Set up an on-premise private cloud for use by employees. Rather than managing virtual machines in the same way as physical machines, with &PRODUCT; an enterprise can offer self-service virtual machines to users without involving IT departments.
+ </para></listitem>
+ </itemizedlist>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/1000-foot-view.png" />
+ </imageobject>
+ <textobject><phrase>1000-foot-view.png: Overview of &PRODUCT;</phrase></textobject>
+ </mediaobject>
</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/whats-in-this-adminguide.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/whats-in-this-adminguide.xml b/docs/en-US/whats-in-this-adminguide.xml
index 94129a4..e34c17f 100644
--- a/docs/en-US/whats-in-this-adminguide.xml
+++ b/docs/en-US/whats-in-this-adminguide.xml
@@ -1,7 +1,7 @@
<section id="whats-in-this-adminguide">
- <title>Who Should Read This</title>
- <para>If you have already installed CloudPlatform or you want to learn more about the ongoing
- operation and maintenance of a CloudPlatform-powered cloud, read this documentation. It
- will help you start using, configuring, and managing the ongoing operation of your cloud.</para>
- </section>
+ <title>Who Should Read This</title>
+ <para>If you have already installed CloudPlatform or you want to learn more about the ongoing
+ operation and maintenance of a CloudPlatform-powered cloud, read this documentation. It
+ will help you start using, configuring, and managing the ongoing operation of your cloud.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/who-should-read-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/who-should-read-installation.xml b/docs/en-US/who-should-read-installation.xml
index 0137811..a4b5e18 100644
--- a/docs/en-US/who-should-read-installation.xml
+++ b/docs/en-US/who-should-read-installation.xml
@@ -4,12 +4,12 @@
%BOOK_ENTITIES;
]>
<section id="who-should-read-installation">
- <title>Who Should Read This</title>
- <para>
- For those who have already gone through a design phase and planned a more sophisticated deployment,
- or those who are ready to start scaling up a trial installation.
- With the following procedures, you can start using the more powerful features of &PRODUCT;,
- such as advanced VLAN networking, high availability, additional network elements such as load balancers and firewalls,
- and support for multiple hypervisors including Citrix XenServer, KVM, and VMware vSphere.
- </para>
+ <title>Who Should Read This</title>
+ <para>
+ For those who have already gone through a design phase and planned a more sophisticated deployment,
+ or those who are ready to start scaling up a trial installation.
+ With the following procedures, you can start using the more powerful features of &PRODUCT;,
+ such as advanced VLAN networking, high availability, additional network elements such as load balancers and firewalls,
+ and support for multiple hypervisors including Citrix XenServer, KVM, and VMware vSphere.
+ </para>
</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/windows-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/windows-installation.xml b/docs/en-US/windows-installation.xml
index 46044bc..9958c96 100644
--- a/docs/en-US/windows-installation.xml
+++ b/docs/en-US/windows-installation.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<section id="windows-installation">
- <title>Windows OS Installation</title>
- <para>Download the installer, CloudInstanceManager.msi, from <ulink url="http://cloudstack.org/download.html">Download page</ulink> and run the installer in the newly created Windows VM.</para>
+ <title>Windows OS Installation</title>
+ <para>Download the installer, CloudInstanceManager.msi, from <ulink url="http://cloudstack.org/download.html">Download page</ulink> and run the installer in the newly created Windows VM.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/working-with-iso.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-iso.xml b/docs/en-US/working-with-iso.xml
index 8b6f345..9f1dc23 100644
--- a/docs/en-US/working-with-iso.xml
+++ b/docs/en-US/working-with-iso.xml
@@ -4,11 +4,11 @@
%BOOK_ENTITIES;
]>
<section id="working-with-iso">
- <title>Working with ISOs</title>
- <para>CloudPlatform supports ISOs and their attachment to guest VMs. An ISO is a read-only file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and mount them on their guest VMs.</para>
- <para>ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is available via HTTP specify an upload URL such as http://my.web.server/filename.iso.</para>
- <para>ISOs may be public or private, like templates.ISOs are not hypervisor-specific. That is, a guest on vSphere can mount the exact same image that a guest on KVM can mount.</para>
- <para>ISO images may be stored in the system and made available with a privacy level similar to templates. ISO images are classified as either bootable or not bootable. A bootable ISO image is one that contains an OS image. CloudPlatform allows a user to boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. For example, this enables installing PV drivers into Windows. ISO images are not hypervisor-specific.</para>
+ <title>Working with ISOs</title>
+ <para>CloudPlatform supports ISOs and their attachment to guest VMs. An ISO is a read-only file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and mount them on their guest VMs.</para>
+ <para>ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is available via HTTP specify an upload URL such as http://my.web.server/filename.iso.</para>
+ <para>ISOs may be public or private, like templates.ISOs are not hypervisor-specific. That is, a guest on vSphere can mount the exact same image that a guest on KVM can mount.</para>
+ <para>ISO images may be stored in the system and made available with a privacy level similar to templates. ISO images are classified as either bootable or not bootable. A bootable ISO image is one that contains an OS image. CloudPlatform allows a user to boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. For example, this enables installing PV drivers into Windows. ISO images are not hypervisor-specific.</para>
<xi:include href="add-iso.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="attach-iso-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="attach-iso-to-vm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/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 1987b23..fa7602c 100644
--- a/docs/en-US/working-with-snapshots.xml
+++ b/docs/en-US/working-with-snapshots.xml
@@ -4,12 +4,12 @@
%BOOK_ENTITIES;
]>
<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>CloudPlatform 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>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, CloudPlatform 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>
+ <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>CloudPlatform 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>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, CloudPlatform 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/dcfa5a50/docs/en-US/working-with-templates.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-templates.xml b/docs/en-US/working-with-templates.xml
index 6073f7b..f54e317 100644
--- a/docs/en-US/working-with-templates.xml
+++ b/docs/en-US/working-with-templates.xml
@@ -4,10 +4,10 @@
%BOOK_ENTITIES;
]>
<section id="working-with-templates">
- <title>Working with Templates</title>
- <para>A template is a reusable configuration for virtual machines. When users launch VMs, they can choose from a list of templates in CloudPlatform.</para>
- <para>Specifically, a template is a virtual disk image that includes one of a variety of operating systems, optional additional software such as office applications, and settings such as access control to determine who can use the template. Each template is associated with a particular type of hypervisor, which is specified when the template is added to CloudPlatform.</para>
- <para>CloudPlatform ships with a default template. In order to present more choices to users, CloudPlatform administrators and users can create templates and add them to CloudPlatform.</para>
+ <title>Working with Templates</title>
+ <para>A template is a reusable configuration for virtual machines. When users launch VMs, they can choose from a list of templates in CloudPlatform.</para>
+ <para>Specifically, a template is a virtual disk image that includes one of a variety of operating systems, optional additional software such as office applications, and settings such as access control to determine who can use the template. Each template is associated with a particular type of hypervisor, which is specified when the template is added to CloudPlatform.</para>
+ <para>CloudPlatform ships with a default template. In order to present more choices to users, CloudPlatform administrators and users can create templates and add them to CloudPlatform.</para>
<xi:include href="create-templates-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="requirements-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="best-practices-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -22,4 +22,4 @@
<xi:include href="create-bare-metal-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="convert-hyperv-vm-to-template.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="delete-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </section>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/working-with-usage-data.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-usage-data.xml b/docs/en-US/working-with-usage-data.xml
index 09a89df..006b54b 100644
--- a/docs/en-US/working-with-usage-data.xml
+++ b/docs/en-US/working-with-usage-data.xml
@@ -8,7 +8,7 @@
<para>The Usage Server provides aggregated usage records which you can use to create billing integration for the CloudStack platform. The Usage Server works by taking data from the events log and creating summary usage records that you can access using the listUsageRecords API call.</para>
<para>The usage records show the amount of resources, such as VM run time or template storage space, consumed by guest instances. In the special case of bare metal instances, no template storage resources are consumed, but records showing zero usage are still included in the Usage Server's output.</para>
<para>The Usage Server runs at least once per day. It can be configured to run multiple times per day. Its behavior is controlled by configuration settings as described in the CloudStack Administration Guide.</para>
- <xi:include href="usage-record-format.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="usage-record-format.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="usage-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="example-response-from-listUsageRecords.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="dates-in-usage-record.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/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 5610672..9099051 100644
--- a/docs/en-US/working-with-volumes.xml
+++ b/docs/en-US/working-with-volumes.xml
@@ -4,9 +4,9 @@
%BOOK_ENTITIES;
]>
<section id="working-with-volumes">
- <title>Using Swift for Secondary Storage</title>
- <para>A volume provides storage to a guest VM. The volume can provide for a root disk or an additional data disk. CloudPlatform supports additional volumes for guest VMs.</para>
- <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 different disk image formats.</para>
- <para>CloudPlatform defines a volume as a unit of storage available to a guest VM. Volumes are either root disks or data disks. The root disk has “/” in the file system and is usually the boot device. Data disks provide for additional storage (e.g. As “/opt” or “D:”). Every guest VM has a root disk, and VMs can also optionally have a data disk. End users can mount multiple data disks to guest VMs. Users choose data disks from the disk offerings created by administrators. The user can create a template from a volume as well; this is the standard procedure for private template creation. Volumes are hypervisor-specific: a volume from one hypervisor type may not be used on a guest of another hypervisor type.</para>
- </section>
+ <title>Using Swift for Secondary Storage</title>
+ <para>A volume provides storage to a guest VM. The volume can provide for a root disk or an additional data disk. CloudPlatform supports additional volumes for guest VMs.</para>
+ <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 different disk image formats.</para>
+ <para>CloudPlatform defines a volume as a unit of storage available to a guest VM. Volumes are either root disks or data disks. The root disk has “/” in the file system and is usually the boot device. Data disks provide for additional storage (e.g. As “/opt” or “D:”). Every guest VM has a root disk, and VMs can also optionally have a data disk. End users can mount multiple data disks to guest VMs. Users choose data disks from the disk offerings created by administrators. The user can create a template from a volume as well; this is the standard procedure for private template creation. Volumes are hypervisor-specific: a volume from one hypervisor type may not be used on a guest of another hypervisor type.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/zone-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/zone-add.xml b/docs/en-US/zone-add.xml
index 7d68375..547722c 100644
--- a/docs/en-US/zone-add.xml
+++ b/docs/en-US/zone-add.xml
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<section id="zone-add">
- <title>Adding a Zone</title>
+ <title>Adding a Zone</title>
<para>These steps assume you have already logged in to the CloudPlatform UI. See <xref linkend="log-in" />.</para>
<orderedlist>
<listitem><para>(Optional) If you are going to use Swift for cloud-wide secondary storage, you need to add it before you add zones.</para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/publican-cloudstack/en-US/Feedback.xml
----------------------------------------------------------------------
diff --git a/docs/publican-cloudstack/en-US/Feedback.xml b/docs/publican-cloudstack/en-US/Feedback.xml
index 5236b0f..c316601 100644
--- a/docs/publican-cloudstack/en-US/Feedback.xml
+++ b/docs/publican-cloudstack/en-US/Feedback.xml
@@ -2,25 +2,25 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section>
- <title>We Need Feedback!</title>
- <indexterm>
- <primary>feedback1</primary>
- <secondary>contact information for this brand</secondary>
+ <title>We Need Feedback!</title>
+ <indexterm>
+ <primary>feedback1</primary>
+ <secondary>contact information for this brand</secondary>
- </indexterm>
- <para>
- If you find a typographical error in this manual, or if you
+ </indexterm>
+ <para>
+ If you find a typographical error in this manual, or if you
have thought of a way to make this manual better, we would
love to hear from you! Please submit a bug:
<ulink url="http://bugs.cloudstack.org">http://bugs.cloudstack.org</ulink>
against the component <application>Doc</application>
- </para>
- <para>
- If you have a suggestion for improving the documentation, try to be as
+ </para>
+ <para>
+ If you have a suggestion for improving the documentation, try to be as
specific as possible when describing it. If you have found an error,
please include the section number and some of the surrounding text
so we can find it easily.
- </para>
+ </para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Author_Group.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Author_Group.xml b/docs/runbook/en-US/Author_Group.xml
index 65080cf..ba9e651 100644
--- a/docs/runbook/en-US/Author_Group.xml
+++ b/docs/runbook/en-US/Author_Group.xml
@@ -24,9 +24,9 @@
<authorgroup>
- <author>
- <firstname>Apache</firstname>
- <surname>CloudStack</surname>
- </author>
+ <author>
+ <firstname>Apache</firstname>
+ <surname>CloudStack</surname>
+ </author>
</authorgroup>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Book_Info.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Book_Info.xml b/docs/runbook/en-US/Book_Info.xml
index 8e06d62..ec59144 100644
--- a/docs/runbook/en-US/Book_Info.xml
+++ b/docs/runbook/en-US/Book_Info.xml
@@ -24,29 +24,29 @@
<bookinfo id="book-Runbook-Runbook">
- <title>Runbook</title>
- <subtitle>Prescriptive instructions for deploying Apache CloudStack</subtitle>
- <productname>Apache CloudStack</productname>
- <productnumber>3.0.2</productnumber>
- <edition>0</edition>
- <pubsnumber>0</pubsnumber>
- <abstract>
- <para>
- These runbooks are designed to provide a strict environment to guarantee
+ <title>Runbook</title>
+ <subtitle>Prescriptive instructions for deploying Apache CloudStack</subtitle>
+ <productname>Apache CloudStack</productname>
+ <productnumber>3.0.2</productnumber>
+ <edition>0</edition>
+ <pubsnumber>0</pubsnumber>
+ <abstract>
+ <para>
+ These runbooks are designed to provide a strict environment to guarantee
a higher degree of success in initial deployments of Apache CloudStack.
All of the elements of the environment will be provided to you.
Apache CloudStack is capable of much more complex configurations,
but they are beyond the scope of this document.
- </para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</bookinfo>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Chapter.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Chapter.xml b/docs/runbook/en-US/Chapter.xml
index 30894e7..4adf63c 100644
--- a/docs/runbook/en-US/Chapter.xml
+++ b/docs/runbook/en-US/Chapter.xml
@@ -34,7 +34,7 @@
This is a test paragraph in a section
</para>
</section>
-
+
<section id="sect-Runbook-Test_Chapter-Test_Section_2">
<title>Test Section 2</title>
<para>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Environment.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Environment.xml b/docs/runbook/en-US/Environment.xml
index 99161d9..781e05d 100644
--- a/docs/runbook/en-US/Environment.xml
+++ b/docs/runbook/en-US/Environment.xml
@@ -65,14 +65,14 @@ ONBOOT="no"
<para>
Unfortunately, this configuration will not permit you to connect to the network,
and is also unsuitable for our purposes with CloudStack. We want to
- configure that file so that it specifies the IP address, netmask, etc., as shown
- in the following example:
+ configure that file so that it specifies the IP address, netmask, etc., as shown
+ in the following example:
</para>
<important>
<title>Hardware Addresses</title>
- <para>You should not use the hardware address (aka MAC address) from our example
- for your configuration. It is network interface specific, so you should keep the
- address already provided in the HWADDR directive.
+ <para>You should not use the hardware address (aka MAC address) from our example
+ for your configuration. It is network interface specific, so you should keep the
+ address already provided in the HWADDR directive.
</para>
</important>
<screen>
@@ -135,7 +135,7 @@ DNS2=8.8.4.4
<para>
To ensure that it remains in that state we need to configure the file
<filename>/etc/selinux/config</filename> to reflect the permissive state,
- as shown in this example: </para>
+ as shown in this example: </para>
<screen>
# This file controls the state of SELinux on the system.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Management.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Management.xml b/docs/runbook/en-US/Management.xml
index d95108e..0df2bf1 100644
--- a/docs/runbook/en-US/Management.xml
+++ b/docs/runbook/en-US/Management.xml
@@ -60,14 +60,14 @@ binlog-format = 'ROW'
</para>
</section>
-
+
<section id="sect-Runbook-Management-extraction">
<title>Extraction</title>
<para>
- The next step is to extract the contents of the CloudStack tarball
- (mentioned in <xref linkend="sect-Runbook-Overview-prereqs" />) you
- downloaded previously. To extract the contents of this tarball use
- the following command:
+ The next step is to extract the contents of the CloudStack tarball
+ (mentioned in <xref linkend="sect-Runbook-Overview-prereqs" />) you
+ downloaded previously. To extract the contents of this tarball use
+ the following command:
</para>
<screen>
<prompt># </prompt><userinput><command>tar</command> -xzvf CloudStack-oss-3.0.2-1-rhel6.2.tar.gz</userinput>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Overview.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Overview.xml b/docs/runbook/en-US/Overview.xml
index 9b64f05..f69798f 100644
--- a/docs/runbook/en-US/Overview.xml
+++ b/docs/runbook/en-US/Overview.xml
@@ -26,17 +26,17 @@
<chapter id="chap-Runbook-Overview">
<title>Overview</title>
<para>
- Infrastructure-as-a-Service (IaaS) clouds can be a complex thing to build,
- and by definition they have a plethora of options, which often lead to confusion
- for even experienced admins who are newcomers to building cloud platforms.
- The goal for this runbook is to provide a straightforward set of instructions
- to get you up and running with CloudStack with a minimum amount of trouble.
+ Infrastructure-as-a-Service (IaaS) clouds can be a complex thing to build,
+ and by definition they have a plethora of options, which often lead to confusion
+ for even experienced admins who are newcomers to building cloud platforms.
+ The goal for this runbook is to provide a straightforward set of instructions
+ to get you up and running with CloudStack with a minimum amount of trouble.
</para>
<section id="sect-Runbook-Overview-What_building">
<title>What exactly are we building?</title>
<para>
- This runbook will focus on building a CloudStack cloud using KVM with
- CentOS 6.2 with NFS storage on a flat layer-2 network utilizing
+ This runbook will focus on building a CloudStack cloud using KVM with
+ CentOS 6.2 with NFS storage on a flat layer-2 network utilizing
layer-3 network isolation (aka Security Groups), and doing it all
on a single piece of hardware.
</para>
@@ -60,7 +60,7 @@
software. Finally we'll spend a good deal of time configuring the entire
cloud in the CloudStack web interface.
</para>
- </section>
+ </section>
<section id="sect-Runbook-Overview-prereqs">
<title>Prerequisites</title>
<para>
@@ -81,8 +81,8 @@
</listitem>
<listitem>
<para>
- A /24 network with the gateway being at xxx.xxx.xxx.1, no DHCP should be on this network and
- none of the computers running CloudStack may have a dynamic address.
+ A /24 network with the gateway being at xxx.xxx.xxx.1, no DHCP should be on this network and
+ none of the computers running CloudStack may have a dynamic address.
</para>
</listitem>
<listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Preface.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Preface.xml b/docs/runbook/en-US/Preface.xml
index 3d26d43..7a62267 100644
--- a/docs/runbook/en-US/Preface.xml
+++ b/docs/runbook/en-US/Preface.xml
@@ -24,10 +24,10 @@
<preface id="pref-Runbook-Preface">
- <title>Preface</title>
- <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- </xi:fallback>
- </xi:include>
+ <title>Preface</title>
+ <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>
</preface>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Revision_History.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Revision_History.xml b/docs/runbook/en-US/Revision_History.xml
index dba81ca..4aecafd 100644
--- a/docs/runbook/en-US/Revision_History.xml
+++ b/docs/runbook/en-US/Revision_History.xml
@@ -24,19 +24,19 @@
<appendix id="appe-Runbook-Revision_History">
- <title>Revision History</title>
- <simpara>
- <revhistory>
- <revision>
- <revnumber>0-0</revnumber>
- <date>Mon Jun 25 2012</date>
- <revdescription>
- <simplelist>
- <member>Initial creation of book by publican</member>
- </simplelist>
- </revdescription>
- </revision>
- </revhistory>
- </simpara>
+ <title>Revision History</title>
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>0-0</revnumber>
+ <date>Mon Jun 25 2012</date>
+ <revdescription>
+ <simplelist>
+ <member>Initial creation of book by publican</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
</appendix>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/Runbook.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/Runbook.xml b/docs/runbook/en-US/Runbook.xml
index 667956b..11f195c 100644
--- a/docs/runbook/en-US/Runbook.xml
+++ b/docs/runbook/en-US/Runbook.xml
@@ -24,14 +24,14 @@
<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Environment.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Management.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="kvm.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- <index /> -->
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <index /> -->
</book>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/runbook/en-US/kvm.xml
----------------------------------------------------------------------
diff --git a/docs/runbook/en-US/kvm.xml b/docs/runbook/en-US/kvm.xml
index 6f9fdad..0311949 100644
--- a/docs/runbook/en-US/kvm.xml
+++ b/docs/runbook/en-US/kvm.xml
@@ -66,7 +66,7 @@
any additional hosts will need for you to complete the above steps.
</para>
</section>
-
+
<section id="sect-Runbook-KVM-Installation">
<title>Installation</title>
<para>