diff --git a/docs/en-US/add-loadbalancer-rule-vpc.xml b/docs/en-US/add-loadbalancer-rule-vpc.xml index 3c164c2140e..90247b0a6f9 100644 --- a/docs/en-US/add-loadbalancer-rule-vpc.xml +++ b/docs/en-US/add-loadbalancer-rule-vpc.xml @@ -60,7 +60,7 @@
Creating a Network Offering for External LB - To have internal LB support on VPC, create a network offering as follows: + To have external LB support on VPC, create a network offering as follows: Log in to the &PRODUCT; UI as a user or admin. @@ -111,12 +111,16 @@ Indicate whether a VLAN should be specified when this offering is used. - Supported Services: Select Load Balancer. - Select InternalLbVM from the provider list. + Supported Services: Select Load Balancer. Use + Netscaler or VpcVirtualRouter. - Load Balancer Type: Select external LB from the - drop-down. Use Netscaler + Load Balancer Type: Select Public LB from the + drop-down. + + + LB Isolation: Select Dedicated if Netscaler is + used as the external LB provider. System Offering: Choose the system service @@ -301,7 +305,9 @@
Creating a Network Offering for Internal LB - To have internal LB support on VPC, create a network offering as follows: + To have internal LB support on VPC, either use the default offering, + DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB, or create a network offering as + follows: Log in to the &PRODUCT; UI as a user or admin. @@ -377,8 +383,6 @@
Creating an Internal LB Rule -<<<<<<< HEAD -======= 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 @@ -387,10 +391,6 @@ >physical_network_name> > Network Service Providers > Internal LB VM. You can manage the Internal LB VMs as and when required from the location. -<<<<<<< HEAD ->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769 -======= ->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769 Log in to the &PRODUCT; UI as an administrator or end user. @@ -424,20 +424,11 @@ that can be displayed to users. -<<<<<<< HEAD -<<<<<<< HEAD - Source IP Address: The source IP from which - traffic originates. Typically, this is the IP of an instance on another tier within - your VPC. -======= -======= ->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769 Source IP Address: (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. For every Source IP, a new Internal LB VM is created for load balancing. ->>>>>>> 030fe5b... review comments for CLOUDSTACK-2808, CLOUDSTACK-769 Source Port: The port associated with the diff --git a/docs/en-US/add-tier.xml b/docs/en-US/add-tier.xml index 17e02be7b7b..94a8237c066 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. - VLAN: The VLAN ID for the tier you create. + VLAN: The VLAN ID for the tier that the root admin + creates. This option is only visible if the network offering you selected is VLAN-enabled. For more information, see the Assigning VLANs to Isolated diff --git a/docs/en-US/vlan-assign-isolated-nw.xml b/docs/en-US/vlan-assign-isolated-nw.xml index 2ed0129cfdf..424ecd2ac4a 100644 --- a/docs/en-US/vlan-assign-isolated-nw.xml +++ b/docs/en-US/vlan-assign-isolated-nw.xml @@ -21,14 +21,18 @@ -->
Assigning VLANs to Isolated Networks - &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. + &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. The former behaviour also is supported — 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. + 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. To enable you to assign VLANs to Isolated networks,