cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [47/70] [partial] Adding documents from 4.2
Date Tue, 08 Oct 2013 19:27:51 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-clusters-vsphere.xml
----------------------------------------------------------------------
diff --git a/en-US/add-clusters-vsphere.xml b/en-US/add-clusters-vsphere.xml
new file mode 100644
index 0000000..c3a0902
--- /dev/null
+++ b/en-US/add-clusters-vsphere.xml
@@ -0,0 +1,178 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="add-clusters-vsphere">
+  <title>Add Cluster: vSphere</title>
+  <para>Host management for vSphere is done through a combination of vCenter and the &PRODUCT; admin
+    UI. &PRODUCT; requires that all hosts be in a &PRODUCT; cluster, but the cluster may consist of
+    a single host. As an administrator you must decide if you would like to use clusters of one host
+    or of multiple hosts. Clusters of multiple hosts allow for features like live migration.
+    Clusters also require shared storage such as NFS or iSCSI.</para>
+  <para>For vSphere servers, we recommend creating the cluster of hosts in vCenter and then adding
+    the entire cluster to &PRODUCT;. Follow these requirements:</para>
+  <itemizedlist>
+    <listitem>
+      <para>Do not put more than 8 hosts in a vSphere cluster</para>
+    </listitem>
+    <listitem>
+      <para>Make sure the hypervisor hosts do not have any VMs already running before you add them
+        to &PRODUCT;.</para>
+    </listitem>
+  </itemizedlist>
+  <para>To add a vSphere cluster to &PRODUCT;:</para>
+  <orderedlist>
+    <listitem>
+      <para>Create the cluster of hosts in vCenter. Follow the vCenter instructions to do this. You
+        will create a cluster that looks something like this in vCenter.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/vsphere-client.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>vsphereclient.png: vSphere client</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>Log in to the UI.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the
+        zone in which you want to add the cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Compute tab, and click View All on Pods. Choose the pod to which you want to
+        add the cluster.</para>
+    </listitem>
+    <listitem>
+      <para>Click View Clusters.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add Cluster.</para>
+    </listitem>
+    <listitem>
+      <para>In Hypervisor, choose VMware.</para>
+    </listitem>
+    <listitem>
+      <para>Provide the following information in the dialog. The fields below make reference to the
+        values from vCenter.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/add-cluster.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>addcluster.png: add a cluster</phrase>
+        </textobject>
+      </mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Cluster Name</emphasis>: Enter the name of the cluster you
+            created in vCenter. For example, "cloud.cluster.2.2.1"</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">vCenter Username</emphasis>: Enter the username that &PRODUCT;
+            should use to connect to vCenter. This user must have all the administrative
+            privileges.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">CPU overcommit ratio</emphasis>: Enter the CPU overcommit
+            ratio for the cluster. The value you enter determines the CPU consumption of each VM in
+            the selected cluster. By increasing the over-provisioning ratio, more resource capacity
+            will be used. If no value is specified, the value is defaulted to 1, which implies no
+            over-provisioning is done.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">RAM overcommit ratio</emphasis>: Enter the RAM overcommit
+            ratio for the cluster. The value you enter determines the memory consumption of each VM
+            in the selected cluster. By increasing the over-provisioning ratio, more resource
+            capacity will be used. If no value is specified, the value is defaulted to 1, which
+            implies no over-provisioning is done.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">vCenter Host</emphasis>: Enter the hostname or IP address of
+            the vCenter server.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">vCenter Password</emphasis>: Enter the password for the user
+            named above.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">vCenter Datacenter</emphasis>: Enter the vCenter datacenter
+            that the cluster is in. For example, "cloud.dc.VM".</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Override Public Traffic</emphasis>: Enable this option to
+            override the zone-wide public traffic for the cluster you are creating.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public Traffic vSwitch Type</emphasis>: This option is
+            displayed only if you enable the Override Public Traffic option. Select a desirable
+            switch. If the vmware.use.dvswitch global parameter is true, the default option will be
+            VMware vNetwork Distributed Virtual Switch.</para>
+          <para>If you have enabled Nexus dvSwitch in the environment, the following parameters for
+            dvSwitch configuration are displayed:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Nexus dvSwitch IP Address: The IP address of the Nexus VSM appliance.</para>
+            </listitem>
+            <listitem>
+              <para>Nexus dvSwitch Username: The username required to access the Nexus VSM
+                appliance.</para>
+            </listitem>
+            <listitem>
+              <para>Nexus dvSwitch Password: The password associated with the username specified
+                above.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Override Guest Traffic</emphasis>: Enable this option to
+            override the zone-wide guest traffic for the cluster you are creating.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest Traffic vSwitch Type</emphasis>: This option is
+            displayed only if you enable the Override Guest Traffic option. Select a desirable
+            switch. </para>
+          <para>If the vmware.use.dvswitch global parameter is true, the default option will be
+            VMware vNetwork Distributed Virtual Switch.</para>
+          <para>If you have enabled Nexus dvSwitch in the environment, the following parameters for
+            dvSwitch configuration are displayed:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Nexus dvSwitch IP Address: The IP address of the Nexus VSM appliance.</para>
+            </listitem>
+            <listitem>
+              <para>Nexus dvSwitch Username: The username required to access the Nexus VSM
+                appliance.</para>
+            </listitem>
+            <listitem>
+              <para>Nexus dvSwitch Password: The password associated with the username specified
+                above.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para>There might be a slight delay while the cluster is provisioned. It will
+            automatically display in the UI.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-gateway-vpc.xml
----------------------------------------------------------------------
diff --git a/en-US/add-gateway-vpc.xml b/en-US/add-gateway-vpc.xml
new file mode 100644
index 0000000..403302d
--- /dev/null
+++ b/en-US/add-gateway-vpc.xml
@@ -0,0 +1,227 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-gateway-vpc">
+  <title>Adding a Private Gateway to a VPC</title>
+  <para>A private gateway can be added by the root admin only. The VPC private network has 1:1
+    relationship with the NIC of the physical network. You can configure multiple private gateways
+    to a single VPC. No gateways with duplicated VLAN and IP are allowed in the same data
+    center.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+      <para>All the VPCs that you have created for the account is listed in the page.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Configure button of the VPC to which you want to configure load balancing
+        rules.</para>
+      <para>The VPC page is displayed where all the tiers you created are listed in a
+        diagram.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Settings icon.</para>
+      <para>The following options are displayed.</para>
+      <itemizedlist>
+        <listitem>
+          <para>Internal LB</para>
+        </listitem>
+        <listitem>
+          <para>Public LB IP</para>
+        </listitem>
+        <listitem>
+          <para>Static NAT</para>
+        </listitem>
+        <listitem>
+          <para>Virtual Machines</para>
+        </listitem>
+        <listitem>
+          <para>CIDR</para>
+        </listitem>
+      </itemizedlist>
+      <para>The following router information is displayed:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Private Gateways</para>
+        </listitem>
+        <listitem>
+          <para>Public IP Addresses</para>
+        </listitem>
+        <listitem>
+          <para>Site-to-Site VPNs</para>
+        </listitem>
+        <listitem>
+          <para>Network ACL Lists</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Select Private Gateways.</para>
+      <para>The Gateways page is displayed.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add new gateway:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/add-new-gateway-vpc.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>add-new-gateway-vpc.png: adding a private gateway for the VPC.</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>Specify the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Physical Network</emphasis>: The physical network you have
+            created in the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">IP Address</emphasis>: The IP address associated with the VPC
+            gateway.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Gateway</emphasis>: The gateway through which the traffic is
+            routed to and from the VPC.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask</emphasis>: The netmask associated with the VPC
+            gateway.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN</emphasis>: The VLAN associated with the VPC
+            gateway.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Source NAT</emphasis>: Select this option to enable the source
+            NAT service on the VPC private gateway.</para>
+          <para>See <xref linkend="sourcenat-private-gateway"/>.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">ACL</emphasis>: Controls both ingress and egress traffic on a
+            VPC private gateway. By default, all the traffic is blocked.</para>
+          <para>See <xref linkend="acl-private-gateway"/>.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The new gateway appears in the list. You can repeat these steps to add more gateway for
+        this VPC.</para>
+    </listitem>
+  </orderedlist>
+  <section id="sourcenat-private-gateway">
+    <title>Source NAT on Private Gateway</title>
+    <para>You might want to deploy multiple VPCs with the same super CIDR and guest tier CIDR.
+      Therefore, multiple guest VMs from different VPCs can have the same IPs to reach a enterprise
+      data center through the private gateway. In such cases, a NAT service need to be configured on
+      the private gateway to avoid IP conflicts. If Source NAT is enabled, the guest VMs in VPC
+      reaches the enterprise network via private gateway IP address by using the NAT service. </para>
+    <para>The Source NAT service on a private gateway can be enabled while adding the private
+      gateway. On deletion of a private gateway, source NAT rules specific to the private gateway
+      are deleted.</para>
+    <para>To enable source NAT on existing private gateways, delete them and create afresh with
+      source NAT. </para>
+  </section>
+  <section id="acl-private-gateway">
+    <title>ACL on Private Gateway</title>
+    <para>The traffic on the VPC private gateway is controlled by creating both ingress and egress
+      network ACL rules. The ACLs contains both allow and deny rules. As per the rule, all the
+      ingress traffic to the private gateway interface and all the egress traffic out from the
+      private gateway interface are blocked. </para>
+    <para>You can change this default behaviour while creating a private gateway. Alternatively, you
+      can do the following:</para>
+    <orderedlist>
+      <listitem>
+        <para>In a VPC, identify the Private Gateway you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>In the Private Gateway page, do either of the following:</para>
+        <itemizedlist>
+          <listitem>
+            <para>Use the Quickview. See <xref linkend="quickview"/>.</para>
+          </listitem>
+          <listitem>
+            <para>Use the Details tab. See <xref linkend="details-tab"/> through .</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem id="quickview">
+        <para>In the Quickview of the selected Private Gateway, click Replace ACL, select the ACL
+          rule, then click OK</para>
+      </listitem>
+      <listitem id="details-tab">
+        <para>Click the IP address of the Private Gateway you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>In the Detail tab, click the Replace ACL button. <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="./images/replace-acl-icon.png"/>
+            </imageobject>
+            <textobject>
+              <phrase>replace-acl-icon.png: button to replace the default ACL behaviour.</phrase>
+            </textobject>
+          </inlinemediaobject></para>
+        <para>The Replace ACL dialog is displayed.</para>
+      </listitem>
+      <listitem>
+        <para>select the ACL rule, then click OK.</para>
+        <para>Wait for few seconds. You can see that the new ACL rule is displayed in the Details
+          page.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section id="static-route">
+    <title>Creating a Static Route</title>
+    <para>&PRODUCT; enables you to specify routing for the VPN connection you create. You can enter
+      one or CIDR addresses to indicate which traffic is to be routed back to the gateway.</para>
+    <orderedlist>
+      <listitem>
+        <para>In a VPC, identify the Private Gateway you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>In the Private Gateway page, click the IP address of the Private Gateway you want to
+          work with.</para>
+      </listitem>
+      <listitem>
+        <para>Select the Static Routes tab.</para>
+      </listitem>
+      <listitem>
+        <para>Specify the CIDR of destination network.</para>
+      </listitem>
+      <listitem>
+        <para>Click Add.</para>
+        <para>Wait for few seconds until the new route is created.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section id="blacklist-route">
+    <title>Blacklisting Routes</title>
+    <para>&PRODUCT; enables you to block a list of routes so that they are not assigned to any of
+      the VPC private gateways. Specify the list of routes that you want to blacklist in the
+        <code>blacklisted.routes</code> global parameter. Note that the parameter update affects
+      only new static route creations. If you block an existing static route, it remains intact and
+      continue functioning. You cannot add a static route if the route is blacklisted for the zone.
+    </para>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-ingress-egress-rules.xml
----------------------------------------------------------------------
diff --git a/en-US/add-ingress-egress-rules.xml b/en-US/add-ingress-egress-rules.xml
new file mode 100644
index 0000000..2490cec
--- /dev/null
+++ b/en-US/add-ingress-egress-rules.xml
@@ -0,0 +1,131 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership. The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-ingress-egress-rules">
+  <title>Adding Ingress and Egress Rules to a Security Group</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network</para>
+    </listitem>
+    <listitem>
+      <para>In Select view, choose Security Groups, then click the security group you want .</para>
+    </listitem>
+    <listitem>
+      <para>To add an ingress rule, click the Ingress Rules tab and fill out the following fields to
+        specify what network traffic is allowed into VM instances in this security group. If no
+        ingress rules are specified, then no traffic will be allowed in, except for responses to any
+        traffic that has been allowed out through an egress rule.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the source of
+            the traffic will be defined by IP address (CIDR) or an existing security group in a
+            &PRODUCT; account (Account). Choose Account if you want to allow incoming traffic from
+            all VMs in another security group</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol</emphasis>. The networking protocol that sources will
+            use to send traffic to the security group. TCP and UDP are typically used for data
+            exchange and end-user communications. ICMP is typically used to send error messages or
+            network monitoring data.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of
+            listening ports that are the destination for the incoming traffic. If you are opening a
+            single port, use the same number in both fields.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of
+            message and error code that will be accepted.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To accept only traffic
+            from IP addresses within a particular address block, enter a CIDR or a comma-separated
+            list of CIDRs. The CIDR is the base IP address of the incoming traffic. For example,
+            192.168.0.0/22. To allow all CIDRs, set to 0.0.0.0/0.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To
+            accept only traffic from another security group, enter the &PRODUCT; account and name of
+            a security group that has already been defined in that account. To allow traffic between
+            VMs within the security group you are editing now, enter the same name you used in step
+            7.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The following example allows inbound HTTP access from anywhere:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/http-access.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>httpaccess.png: allows inbound HTTP access from anywhere</phrase>
+        </textobject>
+      </mediaobject>
+    </listitem>
+    <listitem>
+      <para>To add an egress rule, click the Egress Rules tab and fill out the following fields to
+        specify what type of traffic is allowed to be sent out of VM instances in this security
+        group. If no egress rules are specified, then all traffic will be allowed out. Once egress
+        rules are specified, the following types of traffic are allowed out: traffic specified in
+        egress rules; queries to DNS and DHCP servers; and responses to any traffic that has been
+        allowed in through an ingress rule</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Add by CIDR/Account</emphasis>. Indicate whether the
+            destination of the traffic will be defined by IP address (CIDR) or an existing security
+            group in a &PRODUCT; account (Account). Choose Account if you want to allow outgoing
+            traffic to all VMs in another security group.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol</emphasis>. The networking protocol that VMs will use
+            to send outgoing traffic. TCP and UDP are typically used for data exchange and end-user
+            communications. ICMP is typically used to send error messages or network monitoring
+            data.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start Port, End Port</emphasis>. (TCP, UDP only) A range of
+            listening ports that are the destination for the outgoing traffic. If you are opening a
+            single port, use the same number in both fields.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">ICMP Type, ICMP Code</emphasis>. (ICMP only) The type of
+            message and error code that will be sent</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">CIDR</emphasis>. (Add by CIDR only) To send traffic only to IP
+            addresses within a particular address block, enter a CIDR or a comma-separated list of
+            CIDRs. The CIDR is the base IP address of the destination. For example, 192.168.0.0/22.
+            To allow all CIDRs, set to 0.0.0.0/0.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Account, Security Group</emphasis>. (Add by Account only) To
+            allow traffic to be sent to another security group, enter the &PRODUCT; account and name
+            of a security group that has already been defined in that account. To allow traffic
+            between VMs within the security group you are editing now, enter its name.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Add.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-ip-range.xml
----------------------------------------------------------------------
diff --git a/en-US/add-ip-range.xml b/en-US/add-ip-range.xml
new file mode 100644
index 0000000..6da0668
--- /dev/null
+++ b/en-US/add-ip-range.xml
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="add-ip-range">
+  <title>Multiple Subnets in Shared Network</title>
+  <para>&PRODUCT; provides you with the flexibility to add guest IP ranges from different subnets in
+    Basic zones and security groups-enabled Advanced zones. For security groups-enabled Advanced
+    zones, it implies multiple subnets can be added to the same VLAN. With the addition of this
+    feature, you will be able to add IP address ranges from the same subnet or from a different one
+    when IP address are exhausted. This would in turn allows you to employ higher number of subnets
+    and thus reduce the address management overhead. You can delete the IP ranges you have
+    added.</para>
+  <section id="guidelines-multiplesubnet">
+    <title>Prerequisites and Guidelines</title>
+    <itemizedlist>
+      <listitem>
+        <para>This feature can only be implemented:</para>
+        <itemizedlist>
+          <listitem>
+            <para>on IPv4 addresses</para>
+          </listitem>
+          <listitem>
+            <para>if virtual router is the DHCP provider</para>
+          </listitem>
+          <listitem>
+            <para>on KVM, xenServer, and VMware hypervisors</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>Manually configure the gateway of the new subnet before adding the IP range. </para>
+      </listitem>
+      <listitem>
+        <para>&PRODUCT; supports only one gateway for a subnet; overlapping subnets are not
+          currently supported</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section id="how-to-add-ip">
+    <title>Adding Multiple Subnets to a Shared Network</title>
+    <orderedlist>
+      <listitem>
+        <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+      </listitem>
+      <listitem>
+        <para>In the left navigation, choose Infrastructure. </para>
+      </listitem>
+      <listitem>
+        <para>On Zones, click View More, then click the zone to which you want to work with..</para>
+      </listitem>
+      <listitem>
+        <para>Click Physical Network.</para>
+      </listitem>
+      <listitem>
+        <para>In the Guest node of the diagram, click Configure.</para>
+      </listitem>
+      <listitem>
+        <para>Click Networks.</para>
+      </listitem>
+      <listitem>
+        <para>Select the networks you want to work with.</para>
+      </listitem>
+      <listitem>
+        <para>Click View IP Ranges.</para>
+      </listitem>
+      <listitem>
+        <para>Click Add IP Range.</para>
+        <para>The Add IP Range dialog is displayed, as follows:</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="./images/add-ip-range.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>add-ip-range.png: adding an IP range to a network.</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+      <listitem>
+        <para>Specify the following:</para>
+        <para>All the fields are mandatory.</para>
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">Gateway</emphasis>: The gateway for the tier you create.
+              Ensure that the gateway is within the Super CIDR range that you specified while
+              creating the VPC, and is not overlapped with the CIDR of any existing tier within the
+              VPC.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis role="bold">Netmask</emphasis>: The netmask for the tier you create. </para>
+            <para>For example, if the VPC CIDR is 10.0.0.0/16 and the network tier CIDR is
+              10.0.1.0/24, the gateway of the tier is 10.0.1.1, and the netmask of the tier is
+              255.255.255.0.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis role="bold">Start IP/ End IP</emphasis>: A range of IP addresses that
+              are accessible from the Internet and will be allocated to guest VMs. Enter the first
+              and last IP addresses that define a range that &PRODUCT; can assign to guest VMs
+              .</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para>Click OK.</para>
+      </listitem>
+    </orderedlist>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-iso.xml
----------------------------------------------------------------------
diff --git a/en-US/add-iso.xml b/en-US/add-iso.xml
new file mode 100644
index 0000000..25986e0
--- /dev/null
+++ b/en-US/add-iso.xml
@@ -0,0 +1,151 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-iso">
+  <title>Adding an ISO</title>
+  <para>To make additional operating system or other software available for use with guest VMs, you
+    can add an ISO. The ISO is typically thought of as an operating system image, but you can also
+    add ISOs for other types of software, such as desktop applications that you want to be installed
+    as part of a template.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation bar, click Templates.</para>
+    </listitem>
+    <listitem>
+      <para>In Select View, choose ISOs.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add ISO.</para>
+    </listitem>
+    <listitem>
+      <para>In the Add ISO screen, provide the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: Short name for the ISO image. For example,
+            CentOS 6.2 64-bit.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Description</emphasis>: Display test for the ISO image. For
+            example, CentOS 6.2 64-bit.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">URL</emphasis>: The URL that hosts the ISO image. The
+            Management Server must be able to access this location via HTTP. If needed you can place
+            the ISO image directly on the Management Server</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Zone</emphasis>: Choose the zone where you want the ISO to be
+            available, or All Zones to make it available throughout &PRODUCT;.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Bootable</emphasis>: Whether or not a guest could boot off
+            this ISO image. For example, a CentOS ISO is bootable, a Microsoft Office ISO is not
+            bootable.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">OS Type</emphasis>: This helps &PRODUCT; and the hypervisor
+            perform certain operations and make assumptions that improve the performance of the
+            guest. Select one of the following.</para>
+          <itemizedlist>
+            <listitem>
+              <para>If the operating system of your desired ISO image is listed, choose it.</para>
+            </listitem>
+            <listitem>
+              <para>If the OS Type of the ISO is not listed or if the ISO is not bootable, choose
+                Other.</para>
+            </listitem>
+            <listitem>
+              <para>(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV
+                (32-bit) or Other PV (64-bit)</para>
+            </listitem>
+            <listitem>
+              <para>(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO
+                will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have
+                an IDE root disk. The PV-enabled types are:</para>
+              <informaltable>
+                <tgroup cols="3" align="left" colsep="1" rowsep="1">
+                  <tbody>
+                    <row>
+                      <entry><para>Fedora 13</para></entry>
+                      <entry><para>Fedora 12</para></entry>
+                      <entry><para>Fedora 11</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Fedora 10</para></entry>
+                      <entry><para>Fedora 9</para></entry>
+                      <entry><para>Other PV</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Debian GNU/Linux</para></entry>
+                      <entry><para>CentOS 5.3</para></entry>
+                      <entry><para>CentOS 5.4</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>CentOS 5.5</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 5.3</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 5.4</para></entry>
+                    </row>
+                    <row>
+                      <entry><para>Red Hat Enterprise Linux 5.5</para></entry>
+                      <entry><para>Red Hat Enterprise Linux 6</para></entry>
+                      <entry/>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </informaltable>
+            </listitem>
+          </itemizedlist>
+          <note>
+            <para>It is not recommended to choose an older version of the OS than the version in the
+              image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually not
+              work. In these cases, choose Other.</para>
+          </note>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Extractable</emphasis>: Choose Yes if the ISO should be
+            available for extraction.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public</emphasis>: Choose Yes if this ISO should be available
+            to other users.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Featured</emphasis>: Choose Yes if you would like this ISO to
+            be more prominent for users to select. The ISO will appear in the Featured ISOs list.
+            Only an administrator can make an ISO Featured.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+      <para>The Management Server will download the ISO. Depending on the size of the ISO, this may
+        take a long time. The ISO status column will display Ready once it has been successfully
+        downloaded into secondary storage. Clicking Refresh updates the download percentage.</para>
+    </listitem>
+    <listitem>
+      <para><emphasis role="bold">Important</emphasis>: Wait for the ISO to finish downloading. If
+        you move on to the next task and try to use the ISO right away, it will appear to fail. The
+        entire ISO must be available before &PRODUCT; can work with it.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-load-balancer-rule.xml
----------------------------------------------------------------------
diff --git a/en-US/add-load-balancer-rule.xml b/en-US/add-load-balancer-rule.xml
new file mode 100644
index 0000000..01bf13d
--- /dev/null
+++ b/en-US/add-load-balancer-rule.xml
@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<section id="add-load-balancer-rule">
+  <title>Adding a Load Balancer Rule</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user. </para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>Click the name of the network where you want to load balance the traffic.</para>
+    </listitem>
+    <listitem>
+      <para>Click View IP Addresses.</para>
+    </listitem>
+    <listitem>
+      <para>Click the IP address for which you want to create the rule, then click the Configuration
+        tab.</para>
+    </listitem>
+    <listitem>
+      <para>In the Load Balancing node of the diagram, click View All.</para>
+      <para>In a Basic zone, you can also create a load balancing rule without acquiring or
+        selecting an IP address. &PRODUCT; internally assign an IP when you create the load
+        balancing rule, which is listed in the IP Addresses page when the rule is created. </para>
+      <para>To do that, select the name of the network, then click Add Load Balancer tab. Continue
+        with <xref linkend="config-lb"/>.</para>
+    </listitem>
+    <listitem id="config-lb">
+      <para>Fill in the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: A name for the load balancer rule.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public Port</emphasis>: The port receiving incoming traffic to
+            be balanced.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Private Port</emphasis>: The port that the VMs will use to
+            receive the traffic.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Algorithm</emphasis>: Choose the load balancing algorithm you
+            want &PRODUCT; to use. &PRODUCT; supports a variety of well-known algorithms. If you are
+            not familiar with these choices, you will find plenty of information about them on the
+            Internet.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Stickiness</emphasis>: (Optional) Click Configure and choose
+            the algorithm for the stickiness policy. See Sticky Session Policies for Load Balancer
+            Rules.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">AutoScale</emphasis>: Click Configure and complete the
+            AutoScale configuration as explained in <xref linkend="autoscale"/>.</para>
+        </listitem>
+        <listitem><para><emphasis role="bold">Health Check</emphasis>: (Optional; NetScaler load balancers only)
+          Click Configure and fill in the characteristics of the health check policy.
+          See <xref linkend="health-checks-for-lb-rules"/>.</para>		
+          <itemizedlist>
+            <listitem><para><emphasis role="bold">Ping path (Optional)</emphasis>: Sequence of destinations to which to send health check queries.
+              Default: / (all).</para></listitem>			
+            <listitem><para><emphasis role="bold">Response time (Optional)</emphasis>: How long to wait for a response from the health check (2 - 60 seconds).
+              Default: 5 seconds.</para></listitem>
+            <listitem><para><emphasis role="bold">Interval time (Optional)</emphasis>: Amount of time between health checks (1 second - 5 minutes).
+              Default value is set in the global configuration parameter lbrule_health check_time_interval.</para></listitem>
+            <listitem><para><emphasis role="bold">Healthy threshold (Optional)</emphasis>: Number of consecutive health check successes
+              that are required before declaring an instance healthy.
+              Default: 2.</para></listitem>
+            <listitem><para><emphasis role="bold">Unhealthy threshold (Optional)</emphasis>: Number of consecutive health check failures that are required before declaring an instance unhealthy. 
+              Default: 10.</para></listitem>     
+          </itemizedlist></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click Add VMs, then select two or more VMs that will divide the load of incoming
+        traffic, and click Apply.</para>
+      <para>The new load balancer rule appears in the list. You can repeat these steps to add more
+        load balancer rules for this IP address.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-loadbalancer-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/en-US/add-loadbalancer-rule-vpc.xml b/en-US/add-loadbalancer-rule-vpc.xml
new file mode 100644
index 0000000..90247b0
--- /dev/null
+++ b/en-US/add-loadbalancer-rule-vpc.xml
@@ -0,0 +1,462 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-loadbalancer-rule-vpc">
+  <title>Adding Load Balancing Rules on a VPC</title>
+  <para>In a VPC, you can configure two types of load balancing&mdash;external LB and internal LB.
+    External LB is nothing but a LB rule created to redirect the traffic received at a public IP of
+    the VPC virtual router. The traffic is load balanced within a tier based on your configuration.
+    Citrix NetScaler and VPC virtual router are supported for external LB. When you use internal LB
+    service, traffic received at a tier is load balanced across different VMs within that tier. For
+    example, traffic reached at Web tier is redirected to another VM in that tier. External load
+    balancing devices are not supported for internal LB. The service is provided by a internal LB VM
+    configured on the target tier.</para>
+  <section id="curent-lb-vpc">
+    <title>Load Balancing Within a Tier (External LB)</title>
+    <para>A &PRODUCT; user or administrator may create load balancing rules that balance traffic
+      received at a public IP to one or more VMs that belong to a network tier that provides load
+      balancing service in a VPC. A user creates a rule, specifies an algorithm, and assigns the
+      rule to a set of VMs within a tier.</para>
+    <section id="enable-vpc-public-lb">
+      <title>Enabling NetScaler as the LB Provider on a VPC Tier</title>
+      <orderedlist>
+        <listitem>
+          <para>Add and enable Netscaler VPX in dedicated mode.</para>
+          <para>Netscaler can be used in a VPC environment only if it is in dedicated mode.</para>
+        </listitem>
+        <listitem>
+          <para>Create a network offering, as given in <xref linkend="ext-lb-offering"/>.</para>
+        </listitem>
+        <listitem>
+          <para>Create a VPC with Netscaler as the Public LB provider.</para>
+          <para>For more information, see <xref linkend="add-vpc"/>.</para>
+        </listitem>
+        <listitem>
+          <para>For the VPC, acquire an IP.</para>
+        </listitem>
+        <listitem>
+          <para>Create an external load balancing rule and apply, as given in <xref
+              linkend="ext-lb-vpc"/>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="ext-lb-offering">
+      <title>Creating a Network Offering for External LB</title>
+      <para>To have external LB support on VPC, create a network offering as follows: </para>
+      <orderedlist>
+        <listitem>
+          <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+        </listitem>
+        <listitem>
+          <para>From the Select Offering drop-down, choose Network Offering.</para>
+        </listitem>
+        <listitem>
+          <para>Click Add Network Offering.</para>
+        </listitem>
+        <listitem>
+          <para>In the dialog, make the following choices:</para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="bold">Name</emphasis>: Any desired name for the network
+                offering.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Description</emphasis>: A short description of the
+                offering that can be displayed to users.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Network Rate</emphasis>: Allowed data transfer rate in MB
+                per second.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Traffic Type</emphasis>: The type of network traffic that
+                will be carried on the network.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Guest Type</emphasis>: Choose whether the guest network is
+                isolated or shared.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Persistent</emphasis>: Indicate whether the guest network
+                is persistent or not. The network that you can provision without having to deploy a
+                VM on it is termed persistent network. </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">VPC</emphasis>: This option indicate whether the guest
+                network is Virtual Private Cloud-enabled. A Virtual Private Cloud (VPC) is a
+                private, isolated part of &PRODUCT;. A VPC can have its own virtual network topology
+                that resembles a traditional physical network. For more information on VPCs, see
+                  <xref linkend="vpc"/>.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Specify VLAN</emphasis>: (Isolated guest networks only)
+                Indicate whether a VLAN should be specified when this offering is used.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Supported Services</emphasis>: Select Load Balancer. Use
+                Netscaler or VpcVirtualRouter.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Load Balancer Type</emphasis>: Select Public LB from the
+                drop-down.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">LB Isolation</emphasis>: Select Dedicated if Netscaler is
+                used as the external LB provider.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">System Offering</emphasis>: Choose the system service
+                offering that you want virtual routers to use in this network.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Conserve mode</emphasis>: Indicate whether to use conserve
+                mode. In this mode, network resources are allocated only when the first virtual
+                machine starts in the network.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para>Click OK and the network offering is created.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="ext-lb-vpc">
+      <title>Creating an External LB Rule</title>
+      <orderedlist>
+        <listitem>
+          <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+        </listitem>
+        <listitem>
+          <para>In the left navigation, choose Network.</para>
+        </listitem>
+        <listitem>
+          <para>In the Select view, select VPC.</para>
+          <para>All the VPCs that you have created for the account is listed in the page.</para>
+        </listitem>
+        <listitem>
+          <para>Click the Configure button of the VPC, for which you want to configure load
+            balancing rules.</para>
+          <para>The VPC page is displayed where all the tiers you created listed in a
+            diagram.</para>
+          <para>For each tier, the following options are displayed:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Internal LB</para>
+            </listitem>
+            <listitem>
+              <para>Public LB IP</para>
+            </listitem>
+            <listitem>
+              <para>Static NAT</para>
+            </listitem>
+            <listitem>
+              <para>Virtual Machines</para>
+            </listitem>
+            <listitem>
+              <para>CIDR</para>
+            </listitem>
+          </itemizedlist>
+          <para>The following router information is displayed:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Private Gateways</para>
+            </listitem>
+            <listitem>
+              <para>Public IP Addresses</para>
+            </listitem>
+            <listitem>
+              <para>Site-to-Site VPNs</para>
+            </listitem>
+            <listitem>
+              <para>Network ACL Lists</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para>In the Router node, select Public IP Addresses.</para>
+          <para>The IP Addresses page is displayed.</para>
+        </listitem>
+        <listitem>
+          <para>Click the IP address for which you want to create the rule, then click the
+            Configuration tab.</para>
+        </listitem>
+        <listitem>
+          <para>In the Load Balancing node of the diagram, click View All.</para>
+        </listitem>
+        <listitem>
+          <para>Select the tier to which you want to apply the rule.</para>
+        </listitem>
+        <listitem>
+          <para>Specify the following:</para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="bold">Name</emphasis>: A name for the load balancer rule.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Public Port</emphasis>: The port that receives the
+                incoming traffic to be balanced.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Private Port</emphasis>: The port that the VMs will use to
+                receive the traffic.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Algorithm</emphasis>. Choose the load balancing algorithm
+                you want &PRODUCT; to use. &PRODUCT; supports the following well-known
+                algorithms:</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Round-robin</para>
+                </listitem>
+                <listitem>
+                  <para>Least connections</para>
+                </listitem>
+                <listitem>
+                  <para>Source</para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Stickiness</emphasis>. (Optional) Click Configure and
+                choose the algorithm for the stickiness policy. See Sticky Session Policies for Load
+                Balancer Rules.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Add VMs</emphasis>: Click Add VMs, then select two or more
+                VMs that will divide the load of incoming traffic, and click Apply.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </orderedlist>
+      <para>The new load balancing rule appears in the list. You can repeat these steps to add more
+        load balancing rules for this IP address.</para>
+    </section>
+  </section>
+  <section id="acros-tiers-lb">
+    <title>Load Balancing Across Tiers</title>
+    <para>&PRODUCT; supports sharing workload across different tiers within your VPC. Assume that
+      multiple tiers are set up in your environment, such as Web tier and Application tier. Traffic
+      to each tier is balanced on the VPC virtual router on the public side, as explained in <xref
+        linkend="add-loadbalancer-rule-vpc"/>. If you want the traffic coming from the Web tier to
+      the Application tier to be balanced, use the internal load balancing feature offered by
+      &PRODUCT;.</para>
+    <section id="vpc-pic">
+      <title>How Does Internal LB Work in VPC?</title>
+      <para>In this figure, a public LB rule is created for the public IP 72.52.125.10 with public
+        port 80 and private port 81. The LB rule, created on the VPC virtual router, is applied on
+        the traffic coming from the Internet to the VMs on the Web tier. On the Application tier two
+        internal load balancing rules are created. An internal LB rule for the guest IP 10.10.10.4
+        with load balancer port 23 and instance port 25 is configured on the VM, InternalLBVM1.
+        Another internal LB rule for the guest IP 10.10.10.4 with load balancer port 45 and instance
+        port 46 is configured on the VM, InternalLBVM1. Another internal LB rule for the guest IP
+        10.10.10.6, with load balancer port 23 and instance port 25 is configured on the VM,
+        InternalLBVM2.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="./images/vpc-lb.png"/>
+        </imageobject>
+        <textobject>
+          <phrase>vpc-lb.png: Configuring internal LB for VPC</phrase>
+        </textobject>
+      </mediaobject>
+    </section>
+    <section id="internallb-notes">
+      <title>Guidelines</title>
+      <itemizedlist>
+        <listitem><para>Internal LB and Public LB are mutually exclusive on a tier. If the tier has LB on the public
+            side, then it can't have the Internal LB.</para></listitem>
+        <listitem><para>Internal LB is supported just on VPC networks in &PRODUCT; 4.2 release.</para></listitem>
+        <listitem><para>Only Internal LB VM can act as the Internal LB provider in &PRODUCT; 4.2 release.</para></listitem>
+        <listitem><para>Network upgrade is not supported from the network offering with Internal LB to the network
+            offering with Public LB.</para></listitem>
+        <listitem><para>Multiple tiers can have internal LB support in a VPC.</para></listitem>
+        <listitem><para>Only one tier can have Public LB support in a VPC.</para></listitem>
+      </itemizedlist>
+    </section>
+    <section id="enable-vpc-lb">
+      <title>Enabling Internal LB on a VPC Tier</title>
+      <orderedlist>
+        <listitem>
+          <para>Create a network offering, as given in <xref linkend="int-lb-vpc"/>.</para>
+        </listitem>
+        <listitem>
+          <para>Create an internal load balancing rule and apply, as given in <xref
+              linkend="int-lb-vpc"/>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="int-lb-offering">
+      <title>Creating a Network Offering for Internal LB</title>
+      <para>To have internal LB support on VPC, either use the default offering,
+        DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, or create a network offering as
+        follows: </para>
+      <orderedlist>
+        <listitem>
+          <para>Log in to the &PRODUCT; UI as a user or admin.</para>
+        </listitem>
+        <listitem>
+          <para>From the Select Offering drop-down, choose Network Offering.</para>
+        </listitem>
+        <listitem>
+          <para>Click Add Network Offering.</para>
+        </listitem>
+        <listitem>
+          <para>In the dialog, make the following choices:</para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="bold">Name</emphasis>: Any desired name for the network
+                offering.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Description</emphasis>: A short description of the
+                offering that can be displayed to users.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Network Rate</emphasis>: Allowed data transfer rate in MB
+                per second.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Traffic Type</emphasis>: The type of network traffic that
+                will be carried on the network.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Guest Type</emphasis>: Choose whether the guest network is
+                isolated or shared.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Persistent</emphasis>: Indicate whether the guest network
+                is persistent or not. The network that you can provision without having to deploy a
+                VM on it is termed persistent network. </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">VPC</emphasis>: This option indicate whether the guest
+                network is Virtual Private Cloud-enabled. A Virtual Private Cloud (VPC) is a
+                private, isolated part of &PRODUCT;. A VPC can have its own virtual network topology
+                that resembles a traditional physical network. For more information on VPCs, see
+                  <xref linkend="vpc"/>.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Specify VLAN</emphasis>: (Isolated guest networks only)
+                Indicate whether a VLAN should be specified when this offering is used.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Supported Services</emphasis>: Select Load Balancer.
+                Select <code>InternalLbVM</code> from the provider list.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Load Balancer Type</emphasis>: Select Internal LB from the
+                drop-down.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">System Offering</emphasis>: Choose the system service
+                offering that you want virtual routers to use in this network.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Conserve mode</emphasis>: Indicate whether to use conserve
+                mode. In this mode, network resources are allocated only when the first virtual
+                machine starts in the network.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para>Click OK and the network offering is created.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="int-lb-vpc">
+      <title>Creating an Internal LB Rule</title>
+      <para>When you create the Internal LB rule and applies to a VM, an Internal LB VM, which is
+        responsible for load balancing, is created. </para>
+      <para>You can view the created Internal LB VM in the Instances page if you navigate to
+          <emphasis role="bold">Infrastructure</emphasis> > <emphasis role="bold">Zones</emphasis> >
+          &lt;<emphasis role="italic">zone_ name</emphasis>&gt; > &lt;<emphasis role="italic"
+          >physical_network_name</emphasis>&gt; > <emphasis role="bold">Network Service
+          Providers</emphasis> > <emphasis role="bold">Internal LB VM</emphasis>. You can manage the
+        Internal LB VMs as and when required from the location.</para>
+      <orderedlist>
+        <listitem>
+          <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+        </listitem>
+        <listitem>
+          <para>In the left navigation, choose Network.</para>
+        </listitem>
+        <listitem>
+          <para>In the Select view, select VPC.</para>
+          <para>All the VPCs that you have created for the account is listed in the page.</para>
+        </listitem>
+        <listitem>
+          <para>Locate the VPC for which you want to configure internal LB, then click
+            Configure.</para>
+          <para>The VPC page is displayed where all the tiers you created listed in a
+            diagram.</para>
+        </listitem>
+        <listitem>
+          <para>Locate the Tier for which you want to configure an internal LB rule, click Internal
+            LB.</para>
+          <para>In the Internal LB page, click Add Internal LB.</para>
+        </listitem>
+        <listitem>
+          <para>In the dialog, specify the following:</para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="bold">Name</emphasis>: A name for the load balancer rule.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Description</emphasis>: A short description of the rule
+                that can be displayed to users.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Source IP Address</emphasis>: (Optional) The source IP
+                from which traffic originates. The IP is acquired from the CIDR of that particular
+                tier on which you want to create the Internal LB rule. If not specified, the IP
+                address is automatically allocated from the network CIDR.</para>
+              <para>For every Source IP, a new Internal LB VM is created for load balancing.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Source Port</emphasis>: The port associated with the
+                source IP. Traffic on this port is load balanced. </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Instance Port</emphasis>: The port of the internal LB
+                VM.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Algorithm</emphasis>. Choose the load balancing algorithm
+                you want &PRODUCT; to use. &PRODUCT; supports the following well-known
+                algorithms:</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Round-robin</para>
+                </listitem>
+                <listitem>
+                  <para>Least connections</para>
+                </listitem>
+                <listitem>
+                  <para>Source</para>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </orderedlist>
+    </section>
+  </section>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-members-to-projects.xml
----------------------------------------------------------------------
diff --git a/en-US/add-members-to-projects.xml b/en-US/add-members-to-projects.xml
new file mode 100644
index 0000000..39c3edf
--- /dev/null
+++ b/en-US/add-members-to-projects.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="add-members-to-projects">
+    <title>Adding Members to a Project</title>
+    <para>New members can be added to a project by the project’s administrator, the domain administrator of the domain where the project resides or any parent domain, or the &PRODUCT; root administrator. There are two ways to add members in &PRODUCT;, but only one way is enabled at a time:</para>
+    <itemizedlist>
+        <listitem><para>If invitations have been enabled, you can send invitations to new members.</para></listitem>
+        <listitem><para>If invitations are not enabled, you can add members directly through the UI.</para></listitem>
+    </itemizedlist>
+    <xi:include href="send-projects-membership-invitation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="add-projects-members-from-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </section>
+      

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-more-clusters.xml
----------------------------------------------------------------------
diff --git a/en-US/add-more-clusters.xml b/en-US/add-more-clusters.xml
new file mode 100644
index 0000000..894b4d8
--- /dev/null
+++ b/en-US/add-more-clusters.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="add-more-clusters">
+  <title>Add More Clusters (Optional)</title>
+  <para>You need to tell &PRODUCT; about the hosts that it will manage. Hosts exist inside clusters,
+    so before you begin adding hosts to the cloud, you must add at least one cluster.</para>
+  <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="add-clusters-kvm-xenserver.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <!--  <xi:include href="add-clusters-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+  <xi:include href="add-clusters-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-password-management-to-templates.xml
----------------------------------------------------------------------
diff --git a/en-US/add-password-management-to-templates.xml b/en-US/add-password-management-to-templates.xml
new file mode 100644
index 0000000..581e564
--- /dev/null
+++ b/en-US/add-password-management-to-templates.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="add-password-management-to-templates">
+    <title>Adding Password Management to Your Templates</title>
+    <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the &PRODUCT; UI.</para>
+    <para>To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into &PRODUCT;, you can specify whether reset admin/root password feature should be enabled for this template.</para>
+    <para>The password management feature works always resets the account password on instance boot.  The script does an HTTP call to the virtual router to retrieve the account password that should be set.  As long as the virtual router is accessible the guest will have access to the account password that should be used.   When the user requests a password reset the management server generates and sends a new password to the virtual router for the account.  Thus an instance reboot is necessary to effect any password changes.</para>
+    <para>If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.</para>
+    <xi:include href="linux-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="windows-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-portforward-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/en-US/add-portforward-rule-vpc.xml b/en-US/add-portforward-rule-vpc.xml
new file mode 100644
index 0000000..5b1bb49
--- /dev/null
+++ b/en-US/add-portforward-rule-vpc.xml
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.
+-->
+<section id="add-portforward-vpc">
+  <title>Adding a Port Forwarding Rule on a VPC</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Network.</para>
+    </listitem>
+    <listitem>
+      <para>In the Select view, select VPC.</para>
+      <para>All the VPCs that you have created for the account is listed in the page.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Configure button of the VPC to which you want to deploy the VMs.</para>
+      <para>The VPC page is displayed where all the tiers you created are listed in a
+        diagram.</para>
+      <para>For each tier, the following options are displayed:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Internal LB</para>
+        </listitem>
+        <listitem>
+          <para>Public LB IP</para>
+        </listitem>
+        <listitem>
+          <para>Static NAT</para>
+        </listitem>
+        <listitem>
+          <para>Virtual Machines</para>
+        </listitem>
+        <listitem>
+          <para>CIDR</para>
+        </listitem>
+      </itemizedlist>
+      <para>The following router information is displayed:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Private Gateways</para>
+        </listitem>
+        <listitem>
+          <para>Public IP Addresses</para>
+        </listitem>
+        <listitem>
+          <para>Site-to-Site VPNs</para>
+        </listitem>
+        <listitem>
+          <para>Network ACL Lists</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In the Router node, select Public IP Addresses.</para>
+      <para>The IP Addresses page is displayed.</para>
+    </listitem>
+    <listitem>
+      <para>Click the IP address for which you want to create the rule, then click the Configuration
+        tab.</para>
+    </listitem>
+    <listitem>
+      <para>In the Port Forwarding node of the diagram, click View All.</para>
+    </listitem>
+    <listitem>
+      <para>Select the tier to which you want to apply the rule.</para>
+    </listitem>
+    <listitem>
+      <para>Specify 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>
+          <itemizedlist>
+            <listitem>
+              <para>TCP</para>
+            </listitem>
+            <listitem>
+              <para>UDP</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Add VM</emphasis>: Click Add VM. Select the name of the
+            instance to which this rule applies, and click Apply.</para>
+          <para>You can test the rule by opening an SSH session to the instance.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-primary-storage.xml
----------------------------------------------------------------------
diff --git a/en-US/add-primary-storage.xml b/en-US/add-primary-storage.xml
new file mode 100644
index 0000000..a43567f
--- /dev/null
+++ b/en-US/add-primary-storage.xml
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section id="add-primary-storage">
+  <title>Adding Primary Storage</title>
+  <note>
+    <para>Ensure that nothing stored on the server. Adding the server to CloudStack will destroy any
+      existing data.</para>
+  </note>
+  <para>When you create a new zone, the first primary storage is added as part of that procedure.
+    You can add primary storage servers at any time, such as when adding a new cluster or adding
+    more servers to an existing cluster.</para>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the &PRODUCT; UI.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the
+        zone in which you want to add the primary storage.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Compute tab.</para>
+    </listitem>
+    <listitem>
+      <para>In the Primary Storage node of the diagram, click View All.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add Primary Storage.</para>
+    </listitem>
+    <listitem>
+      <para>Provide the following information in the dialog. The information required varies
+        depending on your choice in Protocol.</para>
+      <itemizedlist>
+        <listitem>
+          <para>Pod. The pod for the storage device.</para>
+        </listitem>
+        <listitem>
+          <para>Cluster. The cluster for the storage device.</para>
+        </listitem>
+        <listitem>
+          <para>Name. The name of the storage device</para>
+        </listitem>
+        <listitem>
+          <para>Protocol. For XenServer, choose either NFS, iSCSI, or PreSetup. For KVM, choose NFS
+            or SharedMountPoint. For vSphere choose either VMFS (iSCSI or FiberChannel) or
+            NFS</para>
+        </listitem>
+        <listitem>
+          <para>Server (for NFS, iSCSI, or PreSetup). The IP address or DNS name of the storage
+            device</para>
+        </listitem>
+        <listitem>
+          <para>Server (for VMFS). The IP address or DNS name of the vCenter server.</para>
+        </listitem>
+        <listitem>
+          <para>Path (for NFS). In NFS this is the exported path from the server.</para>
+        </listitem>
+        <listitem>
+          <para>Path (for VMFS). In vSphere this is a combination of the datacenter name and the
+            datastore name. The format is "/" datacenter name "/" datastore name. For example,
+            "/cloud.dc.VM/cluster1datastore".</para>
+        </listitem>
+        <listitem>
+          <para>Path (for SharedMountPoint). With KVM this is the path on each host that is where
+            this primary storage is mounted. For example, "/mnt/primary".</para>
+        </listitem>
+        <listitem>
+          <para>SR Name-Label (for PreSetup). Enter the name-label of the SR that has been set up
+            outside &PRODUCT;.</para>
+        </listitem>
+        <listitem>
+          <para>Target IQN (for iSCSI). In iSCSI this is the IQN of the target. For example,
+            iqn.1986-03.com.sun:02:01ec9bb549-1271378984</para>
+        </listitem>
+        <listitem>
+          <para>Lun # (for iSCSI). In iSCSI this is the LUN number. For example, 3.</para>
+        </listitem>
+        <listitem>
+          <para>Tags (optional). The comma-separated list of tags for this storage device. It should
+            be an equivalent set or superset of the tags on your disk offerings.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The tag sets on primary storage across clusters in a Zone must be identical. For
+        example, if cluster A provides primary storage that has tags T1 and T2, all other clusters
+        in the Zone must also provide primary storage that has tags T1 and T2.</para>
+    </listitem>
+    <listitem>
+      <para>Click OK.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/b23872a5/en-US/add-projects-members-from-ui.xml
----------------------------------------------------------------------
diff --git a/en-US/add-projects-members-from-ui.xml b/en-US/add-projects-members-from-ui.xml
new file mode 100644
index 0000000..670a0ec
--- /dev/null
+++ b/en-US/add-projects-members-from-ui.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<section id="add-projects-members-from-ui">
+    <title>Adding Project Members From the UI</title>
+    <para>The steps below tell how to add a new member to a project if the invitations feature is not enabled in the cloud. If the invitations feature is enabled cloud,as described in <xref linkend="set-up-invitations"/>, use the procedure in <xref linkend="send-projects-membership-invitation"/>.</para>
+  <orderedlist>
+      <listitem><para>Log in to the &PRODUCT; UI.</para></listitem>
+      <listitem><para>In the left navigation, click Projects.</para></listitem>
+      <listitem><para>In Select View, choose Projects.</para></listitem>
+      <listitem><para>Click the name of the project you want to work with.</para></listitem>
+      <listitem><para>Click the Accounts tab. The current members of the project are listed.</para></listitem>
+      <listitem><para>Type the account name of the new member you want to add, and click Add Account. You can add only people who have an account in this cloud and within the same domain as the project.</para></listitem>
+   </orderedlist>
+   </section>
+      


Mime
View raw message