cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From radh...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 1f46bc3
Date Tue, 27 Aug 2013 06:20:21 GMT
Updated Branches:
  refs/heads/4.2-forward fb4c8b35e -> 1f46bc3fb


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/1f46bc3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f46bc3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f46bc3f

Branch: refs/heads/4.2-forward
Commit: 1f46bc3fb09aead2cf1744d358fea7adba7df6e1
Parents: fb4c8b3
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Tue Aug 27 11:49:52 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Tue Aug 27 11:49:52 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, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f46bc3f/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 3c164c2..90247b0 100644
--- a/docs/en-US/add-loadbalancer-rule-vpc.xml
+++ b/docs/en-US/add-loadbalancer-rule-vpc.xml
@@ -60,7 +60,7 @@
     </section>
     <section id="ext-lb-offering">
       <title>Creating a Network Offering for External LB</title>
-      <para>To have internal LB support on VPC, create a network offering as follows:
</para>
+      <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>
@@ -111,12 +111,16 @@
                 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>
+              <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">Load Balancer Type</emphasis>:
Select external LB from the
-                drop-down. Use Netscaler</para>
+              <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
@@ -301,7 +305,9 @@
     </section>
     <section id="int-lb-offering">
       <title>Creating a Network Offering for Internal LB</title>
-      <para>To have internal LB support on VPC, create a network offering as follows:
</para>
+      <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>
@@ -377,8 +383,6 @@
     </section>
     <section id="int-lb-vpc">
       <title>Creating an Internal LB Rule</title>
-<<<<<<< HEAD
-=======
       <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
@@ -387,10 +391,6 @@
           >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>
-<<<<<<< HEAD
->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
-=======
->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
       <orderedlist>
         <listitem>
           <para>Log in to the &PRODUCT; UI as an administrator or end user.</para>
@@ -424,20 +424,11 @@
                 that can be displayed to users.</para>
             </listitem>
             <listitem>
-<<<<<<< HEAD
-<<<<<<< HEAD
-              <para><emphasis role="bold">Source IP Address</emphasis>:
The source IP from which
-                traffic originates. Typically, this is the IP of an instance on another tier
within
-                your VPC.</para>
-=======
-=======
->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
               <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>
->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769
             </listitem>
             <listitem>
               <para><emphasis role="bold">Source Port</emphasis>: The port
associated with the

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f46bc3f/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/1f46bc3f/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>


Mime
View raw message