Updated Branches:
  refs/heads/4.2 1b90a4554 -> 8268a8ee3

ntier apps review comments for CLOUDSTACK-2808, CLOUDSTACK-769


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8268a8ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8268a8ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8268a8ee

Branch: refs/heads/4.2
Commit: 8268a8ee360e24b0ca4ab31c7502cb5164045332
Parents: 1b90a45
Author: radhikap <radhika.puthiyet...@citrix.com>
Authored: Wed Aug 28 09:30:00 2013 +0530
Committer: radhikap <radhika.puthiyet...@citrix.com>
Committed: Wed Aug 28 09:30:00 2013 +0530

----------------------------------------------------------------------
 docs/en-US/add-loadbalancer-rule-vpc.xml | 33 +++++++++++++++++++--------
 docs/en-US/add-tier.xml                  |  3 ++-
 docs/en-US/vlan-assign-isolated-nw.xml   |  8 +++++--
 3 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8268a8ee/docs/en-US/add-loadbalancer-rule-vpc.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-loadbalancer-rule-vpc.xml 
b/docs/en-US/add-loadbalancer-rule-vpc.xml
index 71fc51c..90247b0 100644
--- a/docs/en-US/add-loadbalancer-rule-vpc.xml
+++ b/docs/en-US/add-loadbalancer-rule-vpc.xml
@@ -278,6 +278,19 @@
         </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>
@@ -371,12 +384,13 @@
     <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. 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>. </para>
+        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>
@@ -410,9 +424,10 @@
                 that can be displayed to users.</para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold">Source IP Address</emphasis>: 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. </para>
+              <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>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8268a8ee/docs/en-US/add-tier.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-tier.xml b/docs/en-US/add-tier.xml
index 17e02be..94a8237 100644
--- a/docs/en-US/add-tier.xml
+++ b/docs/en-US/add-tier.xml
@@ -75,7 +75,8 @@
             the VPC, and is not overlapped with the CIDR of any existing tier 
within the VPC.</para>
         </listitem>
         <listitem>
-          <para><emphasis role="bold">VLAN</emphasis>: The VLAN ID for the 
tier you create. </para>
+          <para><emphasis role="bold">VLAN</emphasis>: The VLAN ID for the 
tier that the root admin
+            creates. </para>
           <para>This option is only visible if the network offering you 
selected is
             VLAN-enabled.</para>
           <para condition="install">For more information, see the Assigning 
VLANs to Isolated

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8268a8ee/docs/en-US/vlan-assign-isolated-nw.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vlan-assign-isolated-nw.xml 
b/docs/en-US/vlan-assign-isolated-nw.xml
index 2ed0129..424ecd2 100644
--- a/docs/en-US/vlan-assign-isolated-nw.xml
+++ b/docs/en-US/vlan-assign-isolated-nw.xml
@@ -21,14 +21,18 @@
 -->
 <section id="vlan-assign-isolated-nw">
   <title>Assigning VLANs to Isolated Networks</title>
-  <para>&PRODUCT; provides you the ability to control VLAN assignment to 
Isolated networks. You can
-    assign a VLAN ID when a network is created, just the way it's done for 
Shared networks.</para>
+  <para>&PRODUCT; provides you the ability to control VLAN assignment to 
Isolated networks. As a
+    Root admin, you can assign a VLAN ID when a network is created, just the 
way it's done for
+    Shared networks.</para>
   <para>The former behaviour also is supported &mdash; VLAN is randomly 
allocated to a network from
     the VNET range of the physical network when the network turns to 
Implemented state. The VLAN is
     released back to the VNET pool when the network shuts down as a part of 
the Network Garbage
     Collection. The VLAN can be re-used either by the same network when it is 
implemented again, or
     by any other network. On each subsequent implementation of a network, a 
new VLAN can be
     assigned.</para>
+  <para>Only the Root admin can assign VLANs because the regular users or 
domain admin are not aware
+    of the physical network topology. They cannot even view what VLAN is 
assigned to a
+    network.</para>
   <para>To enable you to assign VLANs to Isolated networks,</para>
   <orderedlist>
     <listitem>

Reply via email to