You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/12 03:28:51 UTC
[11/31] docs: Fix indentation according to coding convention
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
index 595c979..f108ebb 100644
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@ -23,70 +23,70 @@
-->
<section id="minimum-system-requirements">
- <title>Minimum System Requirements</title>
- <section id="management-server-system-requirements">
- <title>Management Server, Database, and Storage System Requirements</title>
- <para>The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.</para>
- <itemizedlist>
- <listitem><para>Operating system:</para>
- <itemizedlist>
- <listitem><para>Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/).</para></listitem>
- <listitem><para>Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
- <listitem><para>It is highly recommended that you purchase a RHEL support license.
- Citrix support can not be responsible for helping fix issues with the underlying OS.</para></listitem>
- </itemizedlist>
- </listitem>
- <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
- <listitem><para>4 GB of memory</para></listitem>
- <listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
- <listitem><para>At least 1 NIC</para></listitem>
- <listitem><para>Statically allocated IP address</para></listitem>
- <listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
- </itemizedlist>
- </section>
- <section id="hypervisor-system-requirements">
- <title>Host/Hypervisor System Requirements</title>
- <para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
- <itemizedlist>
- <listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem>
- <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
- <listitem><para>Hardware virtualization support required</para></listitem>
- <listitem><para>4 GB of memory</para></listitem>
- <listitem><para>36 GB of local disk</para></listitem>
- <listitem><para>At least 1 NIC</para></listitem>
- <listitem><para>Statically allocated IP Address</para></listitem>
- <listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
- <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
- </itemizedlist>
- <para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
- <warning>
- <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.</para>
- </warning>
- <section id="hypervisor-requirements-xenserver">
- <title>Citrix XenServer requirements</title>
- <para>To be determined</para>
- </section>
- <section id="hypervisor-requirements-vmware">
- <title>VMware vSphere requirements</title>
- <para>To be determined</para>
- </section>
- <section id="hypervisor-requirements-kvm">
- <title>KVM requirements</title>
- <para>For running a KVM hypervisor the main requirement is the Linux distribution it is running. Although you are not required to run these distributions, it is recommended.</para>
- <para>Recommended distributions:</para>
- <itemizedlist>
- <listitem><para>CentOS / RHEL: 6.2 and 6.3</para></listitem>
- <listitem><para>Ubuntu: 12.04(.1)</para></listitem>
- </itemizedlist>
- <para>The main requirement for KVM hypervisors is the libvirt and Qemu version. If you whish to run on a different distribution, make sure you meet the following requirements:</para>
- <itemizedlist>
- <listitem><para>libvirt: 0.9.4 and higher</para></listitem>
- <listitem><para>Qemu/KVM: 1.0 and higher</para></listitem>
- </itemizedlist>
- </section>
- <section id="hypervisor-requirements-ovm">
- <title>Oracle VM (OVM) requirements</title>
- <para>To be determined</para>
- </section>
- </section>
+ <title>Minimum System Requirements</title>
+ <section id="management-server-system-requirements">
+ <title>Management Server, Database, and Storage System Requirements</title>
+ <para>The machines that will run the Management Server and MySQL database must meet the following requirements. The same machines can also be used to provide primary and secondary storage, such as via localdisk or NFS. The Management Server may be placed on a virtual machine.</para>
+ <itemizedlist>
+ <listitem><para>Operating system:</para>
+ <itemizedlist>
+ <listitem><para>Preferred: RHEL 6.2+ 64-bit (https://access.redhat.com/downloads) or CentOS 6.2+ 64-bit (http://isoredirect.centos.org/centos/6/isos/x86_64/).</para></listitem>
+ <listitem><para>Also supported (v3.0.3 and greater): RHEL and CentOS 5.4-5.x 64-bit</para></listitem>
+ <listitem><para>It is highly recommended that you purchase a RHEL support license.
+ Citrix support can not be responsible for helping fix issues with the underlying OS.</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+ <listitem><para>4 GB of memory</para></listitem>
+ <listitem><para>250 GB of local disk (more results in better capability; 500 GB recommended)</para></listitem>
+ <listitem><para>At least 1 NIC</para></listitem>
+ <listitem><para>Statically allocated IP address</para></listitem>
+ <listitem><para>Fully qualified domain name as returned by the hostname command</para></listitem>
+ </itemizedlist>
+ </section>
+ <section id="hypervisor-system-requirements">
+ <title>Host/Hypervisor System Requirements</title>
+ <para>The host is where the cloud services run in the form of guest virtual machines. Each host is one machine that meets the following requirements:</para>
+ <itemizedlist>
+ <listitem><para>Must be 64-bit and must support HVM (Intel-VT or AMD-V enabled).</para></listitem>
+ <listitem><para>64-bit x86 CPU (more cores results in better performance)</para></listitem>
+ <listitem><para>Hardware virtualization support required</para></listitem>
+ <listitem><para>4 GB of memory</para></listitem>
+ <listitem><para>36 GB of local disk</para></listitem>
+ <listitem><para>At least 1 NIC</para></listitem>
+ <listitem><para>Statically allocated IP Address</para></listitem>
+ <listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
+ <listitem><para>When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running</para></listitem>
+ </itemizedlist>
+ <para>Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor:</para>
+ <warning>
+ <para>Be sure you fulfill the additional hypervisor requirements and installation steps provided in this Guide. Hypervisor hosts must be properly prepared to work with CloudStack. For example, the requirements for XenServer are listed under Citrix XenServer Installation.</para>
+ </warning>
+ <section id="hypervisor-requirements-xenserver">
+ <title>Citrix XenServer requirements</title>
+ <para>To be determined</para>
+ </section>
+ <section id="hypervisor-requirements-vmware">
+ <title>VMware vSphere requirements</title>
+ <para>To be determined</para>
+ </section>
+ <section id="hypervisor-requirements-kvm">
+ <title>KVM requirements</title>
+ <para>For running a KVM hypervisor the main requirement is the Linux distribution it is running. Although you are not required to run these distributions, it is recommended.</para>
+ <para>Recommended distributions:</para>
+ <itemizedlist>
+ <listitem><para>CentOS / RHEL: 6.2 and 6.3</para></listitem>
+ <listitem><para>Ubuntu: 12.04(.1)</para></listitem>
+ </itemizedlist>
+ <para>The main requirement for KVM hypervisors is the libvirt and Qemu version. If you whish to run on a different distribution, make sure you meet the following requirements:</para>
+ <itemizedlist>
+ <listitem><para>libvirt: 0.9.4 and higher</para></listitem>
+ <listitem><para>Qemu/KVM: 1.0 and higher</para></listitem>
+ </itemizedlist>
+ </section>
+ <section id="hypervisor-requirements-ovm">
+ <title>Oracle VM (OVM) requirements</title>
+ <para>To be determined</para>
+ </section>
+ </section>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/multi_node_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/multi_node_overview.xml b/docs/en-US/multi_node_overview.xml
index 92904cf..1eee037 100644
--- a/docs/en-US/multi_node_overview.xml
+++ b/docs/en-US/multi_node_overview.xml
@@ -22,22 +22,22 @@
under the License.
-->
- <section id="multi_node_installation_overview">
- <title>Management Server Multi-Node Installation Overview</title>
- <para>
- This section describes installing multiple Management Servers and installing MySQL on a node separate from the Management Servers. The machines must meet the system requirements described in System Requirements.
- </para>
- <warning><para>For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.</para></warning>
- <para>
- The procedure for a multi-node installation is:
- </para>
- <orderedlist>
- <listitem><para>Prepare the Operating System</para></listitem>
- <listitem><para>Install the First Management Server</para></listitem>
- <listitem><para>Install and Configure the Database</para></listitem>
- <listitem><para>Prepare NFS Shares</para></listitem>
- <listitem><para>Prepare and Start Additional Management Servers</para></listitem>
- <listitem><para>Prepare the System VM Template</para></listitem>
- </orderedlist>
- </section>
+ <section id="multi_node_installation_overview">
+ <title>Management Server Multi-Node Installation Overview</title>
+ <para>
+ This section describes installing multiple Management Servers and installing MySQL on a node separate from the Management Servers. The machines must meet the system requirements described in System Requirements.
+ </para>
+ <warning><para>For the sake of security, be sure the public Internet can not access port 8096 or port 8250 on the Management Server.</para></warning>
+ <para>
+ The procedure for a multi-node installation is:
+ </para>
+ <orderedlist>
+ <listitem><para>Prepare the Operating System</para></listitem>
+ <listitem><para>Install the First Management Server</para></listitem>
+ <listitem><para>Install and Configure the Database</para></listitem>
+ <listitem><para>Prepare NFS Shares</para></listitem>
+ <listitem><para>Prepare and Start Additional Management Servers</para></listitem>
+ <listitem><para>Prepare the System VM Template</para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/network-offering-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/network-offering-usage-record-format.xml b/docs/en-US/network-offering-usage-record-format.xml
index 5dfc361..a1b0da9 100644
--- a/docs/en-US/network-offering-usage-record-format.xml
+++ b/docs/en-US/network-offering-usage-record-format.xml
@@ -23,21 +23,21 @@
-->
<section id="network-offering-usage-record-format">
- <title>Network Offering Usage Record Format</title>
- <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 hours)</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>usageid – ID of the network offering</para></listitem>
- <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
- <listitem><para>offeringid – Network offering ID</para></listitem>
- <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
- <listitem><para>virtualMachineId – The ID of the virtual machine</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>Network Offering Usage Record Format</title>
+ <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 hours)</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>usageid – ID of the network offering</para></listitem>
+ <listitem><para>usagetype – A number representing the usage type (see Usage Types)</para></listitem>
+ <listitem><para>offeringid – Network offering ID</para></listitem>
+ <listitem><para>virtualMachineId – The ID of the virtual machine</para></listitem>
+ <listitem><para>virtualMachineId – The ID of the virtual machine</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/network-usage-record-format.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/network-usage-record-format.xml b/docs/en-US/network-usage-record-format.xml
index 742f26b..34b8f2d 100644
--- a/docs/en-US/network-usage-record-format.xml
+++ b/docs/en-US/network-usage-record-format.xml
@@ -23,18 +23,18 @@
-->
<section id="network-usage-record-format">
- <title>Network Usage Record Format</title>
- <para>For network usage (bytes sent/received), 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>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>usageid – Device ID (virtual router ID or external device ID)</para></listitem>
- <listitem><para>type – Device type (domain router, external load balancer, etc.)</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>Network Usage Record Format</title>
+ <para>For network usage (bytes sent/received), 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>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>usageid – Device ID (virtual router ID or external device ID)</para></listitem>
+ <listitem><para>type – Device type (domain router, external load balancer, etc.)</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/networking-in-a-pod.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-in-a-pod.xml b/docs/en-US/networking-in-a-pod.xml
index 1033b15..81f0827 100644
--- a/docs/en-US/networking-in-a-pod.xml
+++ b/docs/en-US/networking-in-a-pod.xml
@@ -23,19 +23,19 @@
-->
<section id="networking-in-a-pod">
- <title>Networking in a Pod</title>
- <para>Figure 2 illustrates network setup within a single pod. The hosts are connected to a pod-level switch. At a minimum, the hosts should have one physical uplink to each switch. Bonded NICs are supported as well. The pod-level switch is a pair of redundant gigabit switches with 10 G uplinks.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/networking-in-a-pod.png" />
- </imageobject>
- <textobject><phrase>networking-in-a-pod.png: Network setup in a pod</phrase></textobject>
- </mediaobject>
- <para>Servers are connected as follows:</para>
- <itemizedlist>
- <listitem><para>Storage devices are connected to only the network that carries management traffic.</para></listitem>
- <listitem><para>Hosts are connected to networks for both management traffic and public traffic. </para></listitem>
- <listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem>
- </itemizedlist>
- <para>We recommend the use of multiple physical Ethernet cards to implement each network interface as well as redundant switch fabric in order to maximize throughput and improve reliability.</para>
+ <title>Networking in a Pod</title>
+ <para>Figure 2 illustrates network setup within a single pod. The hosts are connected to a pod-level switch. At a minimum, the hosts should have one physical uplink to each switch. Bonded NICs are supported as well. The pod-level switch is a pair of redundant gigabit switches with 10 G uplinks.</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/networking-in-a-pod.png" />
+ </imageobject>
+ <textobject><phrase>networking-in-a-pod.png: Network setup in a pod</phrase></textobject>
+ </mediaobject>
+ <para>Servers are connected as follows:</para>
+ <itemizedlist>
+ <listitem><para>Storage devices are connected to only the network that carries management traffic.</para></listitem>
+ <listitem><para>Hosts are connected to networks for both management traffic and public traffic. </para></listitem>
+ <listitem><para>Hosts are also connected to one or more networks carrying guest traffic.</para></listitem>
+ </itemizedlist>
+ <para>We recommend the use of multiple physical Ethernet cards to implement each network interface as well as redundant switch fabric in order to maximize throughput and improve reliability.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/networking-in-a-zone.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-in-a-zone.xml b/docs/en-US/networking-in-a-zone.xml
index 6f4e92a..c380c33 100644
--- a/docs/en-US/networking-in-a-zone.xml
+++ b/docs/en-US/networking-in-a-zone.xml
@@ -23,14 +23,14 @@
-->
<section id="networking-in-a-zone">
- <title>Networking in a Zone</title>
- <para>Figure 3 illustrates the network setup within a single zone.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/networking-in-a-zone.png" />
- </imageobject>
- <textobject><phrase>networking-in-a-zone.png: Network setup in a single zone</phrase></textobject>
- </mediaobject>
- <para>A firewall for management traffic operates in the NAT mode. The network typically is assigned IP addresses in the 192.168.0.0/16 Class B private address space. Each pod is assigned IP addresses in the 192.168.*.0/24 Class C private address space.</para>
- <para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para>
+ <title>Networking in a Zone</title>
+ <para>Figure 3 illustrates the network setup within a single zone.</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/networking-in-a-zone.png" />
+ </imageobject>
+ <textobject><phrase>networking-in-a-zone.png: Network setup in a single zone</phrase></textobject>
+ </mediaobject>
+ <para>A firewall for management traffic operates in the NAT mode. The network typically is assigned IP addresses in the 192.168.0.0/16 Class B private address space. Each pod is assigned IP addresses in the 192.168.*.0/24 Class C private address space.</para>
+ <para>Each zone has its own set of public IP addresses. Public IP addresses from different zones do not overlap.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/networking-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking-overview.xml b/docs/en-US/networking-overview.xml
index 6f244df..798fd7a 100644
--- a/docs/en-US/networking-overview.xml
+++ b/docs/en-US/networking-overview.xml
@@ -23,13 +23,13 @@
-->
<section id="networking-overview">
- <title>Networking Overview</title>
- <para>
- &PRODUCT; offers two types of networking scenario:
- </para>
- <itemizedlist>
- <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
- <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
- </itemizedlist>
- <para>For more details, see Network Setup.</para>
+ <title>Networking Overview</title>
+ <para>
+ &PRODUCT; offers two types of networking scenario:
+ </para>
+ <itemizedlist>
+ <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
+ <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
+ </itemizedlist>
+ <para>For more details, see Network Setup.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/networking_overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networking_overview.xml b/docs/en-US/networking_overview.xml
index f00094c..a5f27c3 100644
--- a/docs/en-US/networking_overview.xml
+++ b/docs/en-US/networking_overview.xml
@@ -23,14 +23,14 @@
-->
<section id="networking_overview">
- <title>Networking Overview</title>
- <para>
- CloudStack offers two types of networking scenario:
- </para>
- <itemizedlist>
- <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
- <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
- </itemizedlist>
- <para>For more details, see Network Setup.</para>
+ <title>Networking Overview</title>
+ <para>
+ CloudStack offers two types of networking scenario:
+ </para>
+ <itemizedlist>
+ <listitem><para>Basic. For AWS-style networking. Provides a single network where guest isolation can be provided through layer-3 means such as security groups (IP address source filtering).</para></listitem>
+ <listitem><para>Advanced. For more sophisticated network topologies. This network model provides the most flexibility in defining guest networks.</para></listitem>
+ </itemizedlist>
+ <para>For more details, see Network Setup.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/nfs-shares-on-management-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/nfs-shares-on-management-server.xml b/docs/en-US/nfs-shares-on-management-server.xml
index a0884ba..2c9b324 100644
--- a/docs/en-US/nfs-shares-on-management-server.xml
+++ b/docs/en-US/nfs-shares-on-management-server.xml
@@ -23,40 +23,40 @@
-->
<section id="nfs-shares-on-management-server">
- <title>Using the Management Server As the NFS Server</title>
- <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server. This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para>
- <para>The exact commands for the following steps may vary depending on your operating system version.</para>
- <orderedlist>
- <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para>
- <programlisting>
+ <title>Using the Management Server As the NFS Server</title>
+ <para>This section tells how to set up NFS shares for primary and secondary storage on the same node with the Management Server. This is more typical of a trial installation, but is technically possible in a larger deployment. It is assumed that you will have less than 16TB of storage on the host.</para>
+ <para>The exact commands for the following steps may vary depending on your operating system version.</para>
+ <orderedlist>
+ <listitem><para>On the Management Server host, create two directories that you will use for primary and secondary storage. For example:</para>
+ <programlisting>
# mkdir -p /export/primary
# mkdir -p /export/secondary
- </programlisting>
- </listitem>
- <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For example:</para>
- <programlisting># vi /etc/exports</programlisting>
- <para>Insert the following line.</para>
- <programlisting>/export *(rw,async,no_root_squash)</programlisting>
- </listitem>
- <listitem><para>Export the /export directory.</para>
- <programlisting># exportfs -a</programlisting>
- </listitem>
- <listitem><para>Edit the /etc/sysconfig/nfs file.</para>
- <programlisting># vi /etc/sysconfig/nfs</programlisting>
- <para>Uncomment the following lines:</para>
- <programlisting>
+ </programlisting>
+ </listitem>
+ <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For example:</para>
+ <programlisting># vi /etc/exports</programlisting>
+ <para>Insert the following line.</para>
+ <programlisting>/export *(rw,async,no_root_squash)</programlisting>
+ </listitem>
+ <listitem><para>Export the /export directory.</para>
+ <programlisting># exportfs -a</programlisting>
+ </listitem>
+ <listitem><para>Edit the /etc/sysconfig/nfs file.</para>
+ <programlisting># vi /etc/sysconfig/nfs</programlisting>
+ <para>Uncomment the following lines:</para>
+ <programlisting>
LOCKD_TCPPORT=32803
LOCKD_UDPPORT=32769
MOUNTD_PORT=892
RQUOTAD_PORT=875
STATD_PORT=662
STATD_OUTGOING_PORT=2020
- </programlisting>
- </listitem>
- <listitem><para>Edit the /etc/sysconfig/iptables file.</para>
- <programlisting># vi /etc/sysconfig/iptables</programlisting>
- <para>Add the following lines at the beginning of the INPUT chain where <NETWORK> is the network that you'll be using:</para>
- <programlisting>
+ </programlisting>
+ </listitem>
+ <listitem><para>Edit the /etc/sysconfig/iptables file.</para>
+ <programlisting># vi /etc/sysconfig/iptables</programlisting>
+ <para>Add the following lines at the beginning of the INPUT chain where <NETWORK> is the network that you'll be using:</para>
+ <programlisting>
-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 111 -j ACCEPT
-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 111 -j ACCEPT
-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 2049 -j ACCEPT
@@ -67,46 +67,46 @@ STATD_OUTGOING_PORT=2020
-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 875 -j ACCEPT
-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 875 -j ACCEPT
-A INPUT -s <NETWORK> -m state --state NEW -p tcp --dport 662 -j ACCEPT
--A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 662 -j ACCEPT
- </programlisting>
- </listitem>
- <listitem><para>Run the following commands:</para>
- <programlisting>
+-A INPUT -s <NETWORK> -m state --state NEW -p udp --dport 662 -j ACCEPT
+ </programlisting>
+ </listitem>
+ <listitem><para>Run the following commands:</para>
+ <programlisting>
# service iptables restart
# service iptables save
- </programlisting>
- </listitem>
- <listitem><para>If NFS v4 communication is used between client and server, add your domain to /etc/idmapd.conf on both the hypervisor host and Management Server.</para>
- <programlisting># vi /etc/idmapd.conf</programlisting>
- <para>Remove the character # from the beginning of the Domain line in idmapd.conf and replace the value in the file with your own domain. In the example below, the domain is company.com.</para>
- <programlisting>Domain = company.com</programlisting>
- </listitem>
- <listitem><para>Reboot the Management Server host.</para>
- <para>Two NFS shares called /export/primary and /export/secondary are now set up.</para>
- </listitem>
- <listitem><para>It is recommended that you test to be sure the previous steps have been successful.</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Log in to the hypervisor host.</para></listitem>
- <listitem><para>Be sure NFS and rpcbind are running. The commands might be different depending on your OS. For example:</para>
- <programlisting>
+ </programlisting>
+ </listitem>
+ <listitem><para>If NFS v4 communication is used between client and server, add your domain to /etc/idmapd.conf on both the hypervisor host and Management Server.</para>
+ <programlisting># vi /etc/idmapd.conf</programlisting>
+ <para>Remove the character # from the beginning of the Domain line in idmapd.conf and replace the value in the file with your own domain. In the example below, the domain is company.com.</para>
+ <programlisting>Domain = company.com</programlisting>
+ </listitem>
+ <listitem><para>Reboot the Management Server host.</para>
+ <para>Two NFS shares called /export/primary and /export/secondary are now set up.</para>
+ </listitem>
+ <listitem><para>It is recommended that you test to be sure the previous steps have been successful.</para>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>Log in to the hypervisor host.</para></listitem>
+ <listitem><para>Be sure NFS and rpcbind are running. The commands might be different depending on your OS. For example:</para>
+ <programlisting>
# service rpcbind start
# service nfs start
# chkconfig nfs on
# chkconfig rpcbind on
-# reboot
- </programlisting>
- </listitem>
- <listitem><para>Log back in to the hypervisor host and try to mount the /export directories. For example (substitute your own management server name):</para>
- <programlisting>
+# reboot
+ </programlisting>
+ </listitem>
+ <listitem><para>Log back in to the hypervisor host and try to mount the /export directories. For example (substitute your own management server name):</para>
+ <programlisting>
# mkdir /primarymount
# mount -t nfs <management-server-name>:/export/primary /primarymount
# umount /primarymount
# mkdir /secondarymount
# mount -t nfs <management-server-name>:/export/secondary /secondarymount
-# umount /secondarymount
- </programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
+# umount /secondarymount
+ </programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/nfs-shares-on-separate-server.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/nfs-shares-on-separate-server.xml b/docs/en-US/nfs-shares-on-separate-server.xml
index e2a7b39..947106d 100644
--- a/docs/en-US/nfs-shares-on-separate-server.xml
+++ b/docs/en-US/nfs-shares-on-separate-server.xml
@@ -23,30 +23,30 @@
-->
<section id="nfs-shares-on-separate-server">
- <title>Using a Separate NFS Server</title>
- <para>This section tells how to set up NFS shares for secondary and (optionally) primary storage on an NFS server running on a separate node from the Management Server.</para>
- <para>The exact commands for the following steps may vary depending on your operating system version.</para>
- <warning><para>(KVM only) Ensure that no volume is already mounted at your NFS mount point.</para></warning>
- <orderedlist>
- <listitem><para>On the storage server, create an NFS share for secondary storage and, if you are using NFS for primary storage as well, create a second NFS share. For example:</para>
- <programlisting>
+ <title>Using a Separate NFS Server</title>
+ <para>This section tells how to set up NFS shares for secondary and (optionally) primary storage on an NFS server running on a separate node from the Management Server.</para>
+ <para>The exact commands for the following steps may vary depending on your operating system version.</para>
+ <warning><para>(KVM only) Ensure that no volume is already mounted at your NFS mount point.</para></warning>
+ <orderedlist>
+ <listitem><para>On the storage server, create an NFS share for secondary storage and, if you are using NFS for primary storage as well, create a second NFS share. For example:</para>
+ <programlisting>
# mkdir -p /export/primary
# mkdir -p /export/secondary
- </programlisting>
- </listitem>
- <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For example:</para>
- <programlisting># vi /etc/exports</programlisting>
- <para>Insert the following line.</para>
- <programlisting>/export *(rw,async,no_root_squash)</programlisting>
- </listitem>
- <listitem><para>Export the /export directory.</para>
- <programlisting># exportfs -a</programlisting>
- </listitem>
- <listitem><para>On the management server, create a mount point for secondary storage. For example:</para>
- <programlisting># mkdir -p /mnt/secondary</programlisting>
- </listitem>
- <listitem><para>Mount the secondary storage on your Management Server. Replace the example NFS server name and NFS share paths below with your own.</para>
- <programlisting># mount -t nfs nfsservername:/nfs/share/secondary /mnt/secondary</programlisting>
- </listitem>
- </orderedlist>
+ </programlisting>
+ </listitem>
+ <listitem><para>To configure the new directories as NFS exports, edit /etc/exports. Export the NFS share(s) with rw,async,no_root_squash. For example:</para>
+ <programlisting># vi /etc/exports</programlisting>
+ <para>Insert the following line.</para>
+ <programlisting>/export *(rw,async,no_root_squash)</programlisting>
+ </listitem>
+ <listitem><para>Export the /export directory.</para>
+ <programlisting># exportfs -a</programlisting>
+ </listitem>
+ <listitem><para>On the management server, create a mount point for secondary storage. For example:</para>
+ <programlisting># mkdir -p /mnt/secondary</programlisting>
+ </listitem>
+ <listitem><para>Mount the secondary storage on your Management Server. Replace the example NFS server name and NFS share paths below with your own.</para>
+ <programlisting># mount -t nfs nfsservername:/nfs/share/secondary /mnt/secondary</programlisting>
+ </listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/physical-network-configuration-settings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/physical-network-configuration-settings.xml b/docs/en-US/physical-network-configuration-settings.xml
index a9eda9e..4ab18b0 100644
--- a/docs/en-US/physical-network-configuration-settings.xml
+++ b/docs/en-US/physical-network-configuration-settings.xml
@@ -23,7 +23,7 @@
-->
<section id="physical-network-configuration-settings">
- <title>Configurable Characteristics of Physical Networks</title>
+ <title>Configurable Characteristics of Physical Networks</title>
<para>&PRODUCT; provides configuration settings you can use to set up a physical network in a zone, including:</para>
<itemizedlist>
<listitem><para>What type of network traffic it carries (guest, public, management, storage)</para></listitem>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/pod-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/pod-add.xml b/docs/en-US/pod-add.xml
index 1c0a2ef..419e333 100644
--- a/docs/en-US/pod-add.xml
+++ b/docs/en-US/pod-add.xml
@@ -23,6 +23,6 @@
-->
<section id="pod-add">
- <title>Adding a Pod</title>
- <para>TODO</para>
+ <title>Adding a Pod</title>
+ <para>TODO</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/port-forwarding.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/port-forwarding.xml b/docs/en-US/port-forwarding.xml
index 25b296d..b778693 100644
--- a/docs/en-US/port-forwarding.xml
+++ b/docs/en-US/port-forwarding.xml
@@ -23,27 +23,27 @@
-->
<section id="port-forwarding">
- <title>Port Forwarding</title>
- <para>A port forward service is a set of port forwarding rules that define a policy. A port forward service is then applied to one or more guest VMs. The guest VM then has its inbound network access managed according to the policy defined by the port forwarding service. You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses to be forwarded.</para>
- <para>A guest VM can be in any number of port forward services. Port forward services can be defined but have no members. If a guest VM is part of more than one network, port forwarding rules will function only if they are defined on the default network</para>
- <para>You cannot use port forwarding to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See Security Groups.</para>
- <para>To set up port forwarding:</para>
- <orderedlist>
- <listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
- <listitem><para>If you have not already done so, add a public IP address range to a zone in CloudPlatform. See Adding a Zone and Pod in the Installation Guide.</para></listitem>
- <listitem><para>Add one or more VM instances to CloudPlatform.</para></listitem>
- <listitem><para>In the left navigation bar, click Network.</para></listitem>
- <listitem><para>Click the name of the guest network where the VMs are running.</para>
- </listitem>
- <listitem><para>Choose an existing IP address or acquire a new IP address. (See Acquiring a New IP Address on page 73.) Click the name of the IP address in the list.</para></listitem>
- <listitem><para>Click the Configuration tab.</para></listitem>
- <listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem>
- <listitem><para>Fill in the following:</para>
- <itemizedlist>
- <listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be addressed on the IP address you acquired in the previous step.</para></listitem>
- <listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for forwarded public traffic.</para></listitem>
- <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two ports.</para></listitem>
- </itemizedlist></listitem>
- <listitem><para>Click Add.</para></listitem>
- </orderedlist>
+ <title>Port Forwarding</title>
+ <para>A port forward service is a set of port forwarding rules that define a policy. A port forward service is then applied to one or more guest VMs. The guest VM then has its inbound network access managed according to the policy defined by the port forwarding service. You can optionally specify one or more CIDRs to filter the source IPs. This is useful when you want to allow only incoming requests from certain IP addresses to be forwarded.</para>
+ <para>A guest VM can be in any number of port forward services. Port forward services can be defined but have no members. If a guest VM is part of more than one network, port forwarding rules will function only if they are defined on the default network</para>
+ <para>You cannot use port forwarding to open ports for an elastic IP address. When elastic IP is used, outside access is instead controlled through the use of security groups. See Security Groups.</para>
+ <para>To set up port forwarding:</para>
+ <orderedlist>
+ <listitem><para>Log in to the CloudPlatform UI as an administrator or end user.</para></listitem>
+ <listitem><para>If you have not already done so, add a public IP address range to a zone in CloudPlatform. See Adding a Zone and Pod in the Installation Guide.</para></listitem>
+ <listitem><para>Add one or more VM instances to CloudPlatform.</para></listitem>
+ <listitem><para>In the left navigation bar, click Network.</para></listitem>
+ <listitem><para>Click the name of the guest network where the VMs are running.</para>
+ </listitem>
+ <listitem><para>Choose an existing IP address or acquire a new IP address. (See Acquiring a New IP Address on page 73.) Click the name of the IP address in the list.</para></listitem>
+ <listitem><para>Click the Configuration tab.</para></listitem>
+ <listitem><para>In the Port Forwarding node of the diagram, click View All.</para></listitem>
+ <listitem><para>Fill in the following:</para>
+ <itemizedlist>
+ <listitem><para><emphasis role="bold">Public Port</emphasis>. The port to which public traffic will be addressed on the IP address you acquired in the previous step.</para></listitem>
+ <listitem><para><emphasis role="bold">Private Port</emphasis>. The port on which the instance is listening for forwarded public traffic.</para></listitem>
+ <listitem><para><emphasis role="bold">Protocol</emphasis>. The communication protocol in use between the two ports.</para></listitem>
+ </itemizedlist></listitem>
+ <listitem><para>Click Add.</para></listitem>
+ </orderedlist>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/prepare-nfs-shares.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/prepare-nfs-shares.xml b/docs/en-US/prepare-nfs-shares.xml
index 9c27d75..28e3fa3 100644
--- a/docs/en-US/prepare-nfs-shares.xml
+++ b/docs/en-US/prepare-nfs-shares.xml
@@ -23,16 +23,16 @@
-->
<section id="prepare-nfs-shares">
- <title>Prepare NFS Shares</title>
- <para>&PRODUCT; needs a place to keep primary and secondary storage (see Cloud Infrastructure Overview). Both of these can be NFS shares. This section tells how to set up the NFS shares before adding the storage to &PRODUCT;.</para>
- <para>For primary storage, you can use iSCSI instead.</para>
- <para>The requirements for primary and secondary storage are described in:</para>
- <itemizedlist>
- <listitem><para>About Primary Storage</para></listitem>
- <listitem><para>About Secondary Storage</para></listitem>
- </itemizedlist>
- <para>A production installation typically uses a separate NFS server. See <xref linkend="nfs-shares-on-separate-server"/>.</para>
- <para>You can also use the Management Server node as the NFS server. This is more typical of a trial installation, but is technically possible in a larger deployment. See <xref linkend="nfs-shares-on-management-server"/>.</para>
- <xi:include href="nfs-shares-on-separate-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="nfs-shares-on-management-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <title>Prepare NFS Shares</title>
+ <para>&PRODUCT; needs a place to keep primary and secondary storage (see Cloud Infrastructure Overview). Both of these can be NFS shares. This section tells how to set up the NFS shares before adding the storage to &PRODUCT;.</para>
+ <para>For primary storage, you can use iSCSI instead.</para>
+ <para>The requirements for primary and secondary storage are described in:</para>
+ <itemizedlist>
+ <listitem><para>About Primary Storage</para></listitem>
+ <listitem><para>About Secondary Storage</para></listitem>
+ </itemizedlist>
+ <para>A production installation typically uses a separate NFS server. See <xref linkend="nfs-shares-on-separate-server"/>.</para>
+ <para>You can also use the Management Server node as the NFS server. This is more typical of a trial installation, but is technically possible in a larger deployment. See <xref linkend="nfs-shares-on-management-server"/>.</para>
+ <xi:include href="nfs-shares-on-separate-server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="nfs-shares-on-management-server.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/prepare-os.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/prepare-os.xml b/docs/en-US/prepare-os.xml
index 03e6c55..677ae43 100644
--- a/docs/en-US/prepare-os.xml
+++ b/docs/en-US/prepare-os.xml
@@ -22,89 +22,89 @@
under the License.
-->
- <section id="prepare-os">
- <title>Prepare the Operating System</title>
- <para>
- The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.
- </para>
- <orderedlist>
- <listitem><para>Log in to your OS as root.</para></listitem>
- <listitem><para>Check for a fully qualified hostname.</para>
- <programlisting># hostname --fqdn</programlisting>
- <para>This should return a fully qualified hostname such as "kvm1.lab.example.org". If it does not, edit /etc/hosts so that it does.</para>
- </listitem>
- <listitem><para>Set SELinux to be permissive by default.</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Check to see whether SELinux is installed on your machine. If not, you can skip to step 4.</para>
- <para>In RHEL or CentOS, SELinux is installed and enabled by default. You can verify this with:</para>
- <programlisting># rpm -qa | grep selinux</programlisting>
- <para condition="community">In Ubuntu, SELinux is not installed by default. You can verify this with:</para>
- <programlisting condition="community"># dpkg --list 'selinux'</programlisting>
- </listitem>
- <listitem><para>Set the SELINUX variable in /etc/selinux/config to “permissive”. This ensures that the permissive setting will be maintained after a system reboot.</para>
- <para condition="community">In RHEL or CentOS:</para>
- <programlisting># vi /etc/selinux/config</programlisting>
- <para condition="community">In Ubuntu (do this step only if SELinux was found on the machine in the previous step):</para>
- <programlisting condition="community"># selinux-config-enforcing permissive</programlisting>
- </listitem>
- <listitem><para>Then set SELinux to permissive starting immediately, without requiring a system reboot.</para>
- <para>In CentOS:</para>
- <programlisting># setenforce permissive</programlisting>
- <para>In RHEL:</para>
- <programlisting># setenforce 0</programlisting>
- <para condition="community">In Ubuntu (do this step only if SELinux was found on the machine):</para>
- <programlisting condition="community"># setenforce permissive</programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Make sure that the machine can reach the Internet.</para>
- <programlisting># ping www.google.com</programlisting>
- </listitem>
- <listitem><para>(RHEL 6.2) If you do not have a Red Hat Network account, you need to prepare a local Yum repository.</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>If you are working with a physical host, insert the RHEL 6.2 installation CD. If you are using a VM, attach the RHEL6 ISO.</para></listitem>
- <listitem><para>Mount the CDROM to /media.</para></listitem>
- <listitem><para>Create a repo file at /etc/yum.repos.d/rhel6.repo. In the file, insert the following lines:</para>
- <programlisting>
+ <section id="prepare-os">
+ <title>Prepare the Operating System</title>
+ <para>
+ The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.
+ </para>
+ <orderedlist>
+ <listitem><para>Log in to your OS as root.</para></listitem>
+ <listitem><para>Check for a fully qualified hostname.</para>
+ <programlisting># hostname --fqdn</programlisting>
+ <para>This should return a fully qualified hostname such as "kvm1.lab.example.org". If it does not, edit /etc/hosts so that it does.</para>
+ </listitem>
+ <listitem><para>Set SELinux to be permissive by default.</para>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>Check to see whether SELinux is installed on your machine. If not, you can skip to step 4.</para>
+ <para>In RHEL or CentOS, SELinux is installed and enabled by default. You can verify this with:</para>
+ <programlisting># rpm -qa | grep selinux</programlisting>
+ <para condition="community">In Ubuntu, SELinux is not installed by default. You can verify this with:</para>
+ <programlisting condition="community"># dpkg --list 'selinux'</programlisting>
+ </listitem>
+ <listitem><para>Set the SELINUX variable in /etc/selinux/config to “permissive”. This ensures that the permissive setting will be maintained after a system reboot.</para>
+ <para condition="community">In RHEL or CentOS:</para>
+ <programlisting># vi /etc/selinux/config</programlisting>
+ <para condition="community">In Ubuntu (do this step only if SELinux was found on the machine in the previous step):</para>
+ <programlisting condition="community"># selinux-config-enforcing permissive</programlisting>
+ </listitem>
+ <listitem><para>Then set SELinux to permissive starting immediately, without requiring a system reboot.</para>
+ <para>In CentOS:</para>
+ <programlisting># setenforce permissive</programlisting>
+ <para>In RHEL:</para>
+ <programlisting># setenforce 0</programlisting>
+ <para condition="community">In Ubuntu (do this step only if SELinux was found on the machine):</para>
+ <programlisting condition="community"># setenforce permissive</programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem><para>Make sure that the machine can reach the Internet.</para>
+ <programlisting># ping www.google.com</programlisting>
+ </listitem>
+ <listitem><para>(RHEL 6.2) If you do not have a Red Hat Network account, you need to prepare a local Yum repository.</para>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>If you are working with a physical host, insert the RHEL 6.2 installation CD. If you are using a VM, attach the RHEL6 ISO.</para></listitem>
+ <listitem><para>Mount the CDROM to /media.</para></listitem>
+ <listitem><para>Create a repo file at /etc/yum.repos.d/rhel6.repo. In the file, insert the following lines:</para>
+ <programlisting>
[rhel]
name=rhel6
baseurl=file:///media
enabled=1
-gpgcheck=0
- </programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Turn on NTP for time synchronization.</para>
- <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
- <orderedlist numeration="loweralpha">
- <listitem><para>Install NTP.</para>
- <para condition="community">On RHEL or CentOS:</para>
- <programlisting># yum install ntp</programlisting>
- <para condition="community">On Ubuntu:</para>
- <programlisting condition="community"># apt-get install ntp</programlisting>
- </listitem>
- <listitem><para>Edit the NTP configuration file to point to your NTP server.</para>
- <programlisting># vi /etc/ntp.conf</programlisting>
- <para>Add one or more server lines in this file with the names of the NTP servers
- you want to use. For example:</para>
- <programlisting>server 0.xenserver.pool.ntp.org
+gpgcheck=0
+ </programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem><para>Turn on NTP for time synchronization.</para>
+ <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>Install NTP.</para>
+ <para condition="community">On RHEL or CentOS:</para>
+ <programlisting># yum install ntp</programlisting>
+ <para condition="community">On Ubuntu:</para>
+ <programlisting condition="community"># apt-get install ntp</programlisting>
+ </listitem>
+ <listitem><para>Edit the NTP configuration file to point to your NTP server.</para>
+ <programlisting># vi /etc/ntp.conf</programlisting>
+ <para>Add one or more server lines in this file with the names of the NTP servers
+ you want to use. For example:</para>
+ <programlisting>server 0.xenserver.pool.ntp.org
server 1.xenserver.pool.ntp.org
server 2.xenserver.pool.ntp.org
server 3.xenserver.pool.ntp.org
</programlisting>
- </listitem>
- <listitem><para>Restart the NTP client.</para>
- <programlisting># service ntpd restart</programlisting>
- </listitem>
- <listitem><para>Make sure NTP will start again upon reboot.</para>
- <para condition="community">On RHEL or CentOS:</para>
- <programlisting># chkconfig ntpd on</programlisting>
- <para condition="community">On Ubuntu:</para>
- <programlisting># chkconfig ntp on</programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Repeat all of these steps on every host where the Management Server will be installed.</para></listitem>
- </orderedlist>
- </section>
+ </listitem>
+ <listitem><para>Restart the NTP client.</para>
+ <programlisting># service ntpd restart</programlisting>
+ </listitem>
+ <listitem><para>Make sure NTP will start again upon reboot.</para>
+ <para condition="community">On RHEL or CentOS:</para>
+ <programlisting># chkconfig ntpd on</programlisting>
+ <para condition="community">On Ubuntu:</para>
+ <programlisting># chkconfig ntp on</programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem><para>Repeat all of these steps on every host where the Management Server will be installed.</para></listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/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 3720074..ffef8cd 100644
--- a/docs/en-US/prepare-system-vm-template.xml
+++ b/docs/en-US/prepare-system-vm-template.xml
@@ -23,34 +23,34 @@
-->
<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/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>
# umount /mnt/secondary
# rmdir /mnt/secondary
- </programlisting>
- </listitem>
- <listitem><para>Repeat these steps for each secondary storage server.</para>
- </listitem>
- </orderedlist>
+ </programlisting>
+ </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/dcfa5a50/docs/en-US/prepare_os.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/prepare_os.xml b/docs/en-US/prepare_os.xml
index 509da7a..f0fc201 100644
--- a/docs/en-US/prepare_os.xml
+++ b/docs/en-US/prepare_os.xml
@@ -22,85 +22,85 @@
under the License.
-->
- <section id="prepare_os">
- <title>Prepare the Operating System</title>
- <para>The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.</para>
- <orderedlist>
- <listitem><para>Log in to your OS as root.</para></listitem>
- <listitem><para>Check for a fully qualified hostname.</para>
- <programlisting># hostname --fqdn</programlisting>
- <para>This should return a fully qualified hostname such as "kvm1.lab.example.org". If it does not, edit /etc/hosts so that it does.</para>
- </listitem>
- <listitem><para>Set SELinux to be permissive by default.</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>Check to see whether SELinux is installed on your machine. If not, you can skip to step 4.</para>
- <para>In RHEL or CentOS, SELinux are installed and enabled by default. You can verify this with:</para>
- <programlisting># rpm -qa | grep selinux</programlisting>
- <para>In Ubuntu, SELinux is not installed by default. You can verify this with:</para>
- <programlisting># dpkg --list 'selinux'</programlisting>
- </listitem>
- <listitem><para>Set the SELINUX variable in /etc/selinux/config to “permissive”. This ensures that the permissive setting will be maintained after a system reboot.</para>
- <para>In RHEL or CentOS:</para>
- <programlisting># vi /etc/selinux/config</programlisting>
- <para>In Ubuntu (do this step only if SELinux was found on the machine in the previous step):</para>
- <programlisting># selinux-config-enforcing permissive</programlisting>
- </listitem>
- <listitem><para>Then set SELinux to permissive starting immediately, without requiring a system reboot.</para>
- <para>In CentOS:</para>
- <programlisting># setenforce permissive</programlisting>
- <para>In RHEL:</para>
- <programlisting># setenforce 0</programlisting>
- <para>In Ubuntu (do this step only if SELinux was found on the machine):</para>
- <programlisting># setenforce permissive</programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Make sure that the Management Server can reach the Internet.</para>
- <programlisting># ping www.google.com</programlisting>
- </listitem>
- <listitem><para>(RHEL 6.2) If you do not have a Red Hat Network account, you need to prepare a local Yum repository.</para>
- <orderedlist numeration="loweralpha">
- <listitem><para>If you are working with a physical host, insert the RHEL 6.2 installation CD. If you are using a VM, attach the RHEL6 ISO.</para></listitem>
- <listitem><para>Mount the CDROM to /media.</para></listitem>
- <listitem><para>Create a repo file at /etc/yum.repos.d/rhel6.repo. In the file, insert the following lines:</para>
- <programlisting>
+ <section id="prepare_os">
+ <title>Prepare the Operating System</title>
+ <para>The OS must be prepared to host the Management Server using the following steps. These steps must be performed on each Management Server node.</para>
+ <orderedlist>
+ <listitem><para>Log in to your OS as root.</para></listitem>
+ <listitem><para>Check for a fully qualified hostname.</para>
+ <programlisting># hostname --fqdn</programlisting>
+ <para>This should return a fully qualified hostname such as "kvm1.lab.example.org". If it does not, edit /etc/hosts so that it does.</para>
+ </listitem>
+ <listitem><para>Set SELinux to be permissive by default.</para>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>Check to see whether SELinux is installed on your machine. If not, you can skip to step 4.</para>
+ <para>In RHEL or CentOS, SELinux are installed and enabled by default. You can verify this with:</para>
+ <programlisting># rpm -qa | grep selinux</programlisting>
+ <para>In Ubuntu, SELinux is not installed by default. You can verify this with:</para>
+ <programlisting># dpkg --list 'selinux'</programlisting>
+ </listitem>
+ <listitem><para>Set the SELINUX variable in /etc/selinux/config to “permissive”. This ensures that the permissive setting will be maintained after a system reboot.</para>
+ <para>In RHEL or CentOS:</para>
+ <programlisting># vi /etc/selinux/config</programlisting>
+ <para>In Ubuntu (do this step only if SELinux was found on the machine in the previous step):</para>
+ <programlisting># selinux-config-enforcing permissive</programlisting>
+ </listitem>
+ <listitem><para>Then set SELinux to permissive starting immediately, without requiring a system reboot.</para>
+ <para>In CentOS:</para>
+ <programlisting># setenforce permissive</programlisting>
+ <para>In RHEL:</para>
+ <programlisting># setenforce 0</programlisting>
+ <para>In Ubuntu (do this step only if SELinux was found on the machine):</para>
+ <programlisting># setenforce permissive</programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem><para>Make sure that the Management Server can reach the Internet.</para>
+ <programlisting># ping www.google.com</programlisting>
+ </listitem>
+ <listitem><para>(RHEL 6.2) If you do not have a Red Hat Network account, you need to prepare a local Yum repository.</para>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>If you are working with a physical host, insert the RHEL 6.2 installation CD. If you are using a VM, attach the RHEL6 ISO.</para></listitem>
+ <listitem><para>Mount the CDROM to /media.</para></listitem>
+ <listitem><para>Create a repo file at /etc/yum.repos.d/rhel6.repo. In the file, insert the following lines:</para>
+ <programlisting>
[rhel]
name=rhel6
baseurl=file:///media
enabled=1
-gpgcheck=0
- </programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem><para>Turn on NTP for time synchronization.</para>
- <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
- <orderedlist numeration="loweralpha">
- <listitem><para>Install NTP.</para>
- <para>On RHEL or CentOS:</para>
- <programlisting># yum install ntp</programlisting>
- <para>On Ubuntu:</para>
- <programlisting># apt-get install ntp</programlisting>
- </listitem>
- <listitem><para>Edit the NTP configuration file to point to your NTP server.</para>
- <programlisting># vi /etc/ntp.conf</programlisting>
- <para>For example, you can use one of the following:</para>
- <programlisting>0.xenserver.pool.ntp.org
+gpgcheck=0
+ </programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem><para>Turn on NTP for time synchronization.</para>
+ <note><para>NTP is required to synchronize the clocks of the servers in your cloud.</para></note>
+ <orderedlist numeration="loweralpha">
+ <listitem><para>Install NTP.</para>
+ <para>On RHEL or CentOS:</para>
+ <programlisting># yum install ntp</programlisting>
+ <para>On Ubuntu:</para>
+ <programlisting># apt-get install ntp</programlisting>
+ </listitem>
+ <listitem><para>Edit the NTP configuration file to point to your NTP server.</para>
+ <programlisting># vi /etc/ntp.conf</programlisting>
+ <para>For example, you can use one of the following:</para>
+ <programlisting>0.xenserver.pool.ntp.org
1.xenserver.pool.ntp.org
2.xenserver.pool.ntp.org
3.xenserver.pool.ntp.org
</programlisting>
- </listitem>
- <listitem><para>Restart the NTP client.</para>
- <programlisting># service ntpd restart</programlisting>
- </listitem>
- <listitem><para>Make sure NTP will start again upon reboot.</para>
- <para>On RHEL or CentOS:</para>
- <programlisting># chkconfig ntpd on</programlisting>
- <para>On Ubuntu:</para>
- <programlisting># chkconfig ntp on</programlisting>
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
- </section>
+ </listitem>
+ <listitem><para>Restart the NTP client.</para>
+ <programlisting># service ntpd restart</programlisting>
+ </listitem>
+ <listitem><para>Make sure NTP will start again upon reboot.</para>
+ <para>On RHEL or CentOS:</para>
+ <programlisting># chkconfig ntpd on</programlisting>
+ <para>On Ubuntu:</para>
+ <programlisting># chkconfig ntp on</programlisting>
+ </listitem>
+ </orderedlist>
+ </listitem>
+ </orderedlist>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/primary-storage-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/primary-storage-add.xml b/docs/en-US/primary-storage-add.xml
index a4509e6..588d491 100644
--- a/docs/en-US/primary-storage-add.xml
+++ b/docs/en-US/primary-storage-add.xml
@@ -23,6 +23,6 @@
-->
<section id="primary-storage-add">
- <title>Adding Primary Storage</title>
- <para>TODO</para>
+ <title>Adding Primary Storage</title>
+ <para>TODO</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/primary-storage.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/primary-storage.xml b/docs/en-US/primary-storage.xml
index 59c95cc..4860488 100644
--- a/docs/en-US/primary-storage.xml
+++ b/docs/en-US/primary-storage.xml
@@ -23,6 +23,6 @@
-->
<section id="primary-storage">
- <title>Primary Storage</title>
- <para>This section gives concepts and technical details about CloudPlatform primary storage. For information about how to install and configure primary storage through the CloudPlatform UI, see the Advanced Installation Guide.</para>
- </section>
+ <title>Primary Storage</title>
+ <para>This section gives concepts and technical details about CloudPlatform primary storage. For information about how to install and configure primary storage through the CloudPlatform UI, see the Advanced Installation Guide.</para>
+ </section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/private-public-template.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/private-public-template.xml b/docs/en-US/private-public-template.xml
index 95abd65..8556583 100644
--- a/docs/en-US/private-public-template.xml
+++ b/docs/en-US/private-public-template.xml
@@ -23,8 +23,8 @@
-->
<section id="private-public-template">
- <title>Private and Public Templates</title>
- <para>When a user creates a template, it can be designated private or public.</para>
- <para>Private templates are only available to the user who created them. By default, an uploaded template is private.</para>
- <para>When a user marks a template as “public,” the template becomes available to all users in all accounts in the user's domain, as well as users in any other domains that have access to the Zone where the template is stored. This depends on whether the Zone, in turn, was defined as private or public. A private Zone is assigned to a single domain, and a public Zone is accessible to any domain. If a public template is created in a private Zone, it is available only to users in the domain assigned to that Zone. If a public template is created in a public Zone, it is available to all users in all domains.</para>
+ <title>Private and Public Templates</title>
+ <para>When a user creates a template, it can be designated private or public.</para>
+ <para>Private templates are only available to the user who created them. By default, an uploaded template is private.</para>
+ <para>When a user marks a template as “public,” the template becomes available to all users in all accounts in the user's domain, as well as users in any other domains that have access to the Zone where the template is stored. This depends on whether the Zone, in turn, was defined as private or public. A private Zone is assigned to a single domain, and a public Zone is accessible to any domain. If a public template is created in a private Zone, it is available only to users in the domain assigned to that Zone. If a public template is created in a public Zone, it is available to all users in all domains.</para>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/provisioning-steps-overview.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning-steps-overview.xml b/docs/en-US/provisioning-steps-overview.xml
index d78a604..1da4485 100644
--- a/docs/en-US/provisioning-steps-overview.xml
+++ b/docs/en-US/provisioning-steps-overview.xml
@@ -23,24 +23,24 @@
-->
<section id="provisioning-steps-overview">
- <title>Overview of Provisioning Steps</title>
- <para>After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.</para>
- <para>To provision the cloud infrastructure, or to scale it up at any time, follow these procedures:</para>
- <orderedlist>
- <listitem><para>Change the root password. See <xref linkend="changing-root-password" />.</para></listitem>
- <listitem><para>Add a zone. See <xref linkend="zone-add" />.</para></listitem>
- <listitem><para>Add more pods (optional). See <xref linkend="pod-add" />.</para></listitem>
- <listitem><para>Add more clusters (optional). See <xref linkend="cluster-add" />.</para></listitem>
- <listitem><para>Add more hosts (optional). See <xref linkend="host-add" />.</para></listitem>
- <listitem><para>Add primary storage. See <xref linkend="primary-storage-add" />.</para></listitem>
- <listitem><para>Add secondary storage. See <xref linkend="secondary-storage-add" />.</para></listitem>
- <listitem><para>Initialize and test the new cloud. See <xref linkend="initialize-and-test" />.</para></listitem>
- </orderedlist>
- <para>When you have finished these steps, you will have a deployment with the following basic structure:</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="./images/provisioning-overview.png" />
- </imageobject>
- <textobject><phrase>provisioning-overview.png: Conceptual overview of a basic deployment</phrase></textobject>
- </mediaobject>
+ <title>Overview of Provisioning Steps</title>
+ <para>After the Management Server is installed and running, you can add the compute resources for it to manage. For an overview of how a &PRODUCT; cloud infrastructure is organized, see <xref linkend="cloud-infrastructure-overview" />.</para>
+ <para>To provision the cloud infrastructure, or to scale it up at any time, follow these procedures:</para>
+ <orderedlist>
+ <listitem><para>Change the root password. See <xref linkend="changing-root-password" />.</para></listitem>
+ <listitem><para>Add a zone. See <xref linkend="zone-add" />.</para></listitem>
+ <listitem><para>Add more pods (optional). See <xref linkend="pod-add" />.</para></listitem>
+ <listitem><para>Add more clusters (optional). See <xref linkend="cluster-add" />.</para></listitem>
+ <listitem><para>Add more hosts (optional). See <xref linkend="host-add" />.</para></listitem>
+ <listitem><para>Add primary storage. See <xref linkend="primary-storage-add" />.</para></listitem>
+ <listitem><para>Add secondary storage. See <xref linkend="secondary-storage-add" />.</para></listitem>
+ <listitem><para>Initialize and test the new cloud. See <xref linkend="initialize-and-test" />.</para></listitem>
+ </orderedlist>
+ <para>When you have finished these steps, you will have a deployment with the following basic structure:</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/provisioning-overview.png" />
+ </imageobject>
+ <textobject><phrase>provisioning-overview.png: Conceptual overview of a basic deployment</phrase></textobject>
+ </mediaobject>
</section>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/provisioning-steps.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml
index 074ad30..fda3e17 100644
--- a/docs/en-US/provisioning-steps.xml
+++ b/docs/en-US/provisioning-steps.xml
@@ -23,8 +23,8 @@
-->
<section id="provisioning-steps">
- <title>Steps to Provisioning Your Cloud Infrastructure</title>
- <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
+ <title>Steps to Provisioning Your Cloud Infrastructure</title>
+ <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para>
<xi:include href="provisioning-steps-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="changing-root-password.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="zone-add.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/provisioning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/provisioning.xml b/docs/en-US/provisioning.xml
index dd6c79b..07758ef 100644
--- a/docs/en-US/provisioning.xml
+++ b/docs/en-US/provisioning.xml
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<chapter id="provisioning">
- <title>Provisioning Your Cloud Infrastructure</title>
- <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <title>Provisioning Your Cloud Infrastructure</title>
+ <xi:include href="cloud-infrastructure-concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="provisioning-steps.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/dcfa5a50/docs/en-US/query-filter.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/query-filter.xml b/docs/en-US/query-filter.xml
index 81cff23..fa5ea63 100644
--- a/docs/en-US/query-filter.xml
+++ b/docs/en-US/query-filter.xml
@@ -25,31 +25,31 @@
<section id="query-filter">
<title>Query Filter</title>
<para>The query filter is used to find a mapped user in the external LDAP server. The query filter should uniquely map the CloudPlatform user to LDAP user for a meaningful authentication. For more information about query filter syntax, consult the documentation for your LDAP server.</para>
-<para>The CloudPlatform query filter wildcards are:</para>
- <informaltable>
- <tgroup cols="2" align="left" colsep="1" rowsep="1">
- <thead>
- <row>
- <entry><para>Query Filter Wildcard</para></entry>
- <entry><para>Description</para></entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry><para>%u</para></entry>
- <entry><para>User name</para></entry>
- </row>
- <row>
- <entry><para>%e</para></entry>
- <entry><para>Email address</para></entry>
- </row>
- <row>
- <entry><para>%n</para></entry>
- <entry><para>First and last name</para></entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
+<para>The CloudPlatform query filter wildcards are:</para>
+ <informaltable>
+ <tgroup cols="2" align="left" colsep="1" rowsep="1">
+ <thead>
+ <row>
+ <entry><para>Query Filter Wildcard</para></entry>
+ <entry><para>Description</para></entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><para>%u</para></entry>
+ <entry><para>User name</para></entry>
+ </row>
+ <row>
+ <entry><para>%e</para></entry>
+ <entry><para>Email address</para></entry>
+ </row>
+ <row>
+ <entry><para>%n</para></entry>
+ <entry><para>First and last name</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
<para>The following examples assume you are using Active Directory, and refer to user attributes from the Active Directory schema.</para>
<para>If the CloudPlatform user name is the same as the LDAP user ID:</para>
<programlisting>(uid=%u)</programlisting>