Updated Branches: refs/heads/master 2f51bcf2a -> a011267ba
ntier apps CLOUDSTACK-2801,CLOUDSTACK-2802,CLOUDSTACK-2806,CLOUDSTACK-2816 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a011267b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a011267b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a011267b Branch: refs/heads/master Commit: a011267ba6bba975084415a8a6b0e8217ea77cfa Parents: 2f51bcf Author: Radhika PC <radhika.puthiyet...@citrix.com> Authored: Mon Jun 3 16:26:46 2013 +0530 Committer: Radhika PC <radhika.puthiyet...@citrix.com> Committed: Mon Jun 3 16:27:43 2013 +0530 ---------------------------------------------------------------------- docs/en-US/acquire-new-ip-for-vpc.xml | 33 +++++++++--- docs/en-US/add-gateway-vpc.xml | 57 +++++++++++++++++++-- docs/en-US/add-portforward-rule-vpc.xml | 36 +++++++++---- docs/en-US/add-tier.xml | 5 ++- docs/en-US/add-vm-to-tier.xml | 14 ++++- docs/en-US/enable-disable-static-nat-vpc.xml | 35 +++++++++---- docs/en-US/images/add-new-gateway-vpc.png | Bin 23184 -> 21912 bytes docs/en-US/images/add-vm-vpc.png | Bin 0 -> 8596 bytes docs/en-US/images/del-tier.png | Bin 0 -> 815 bytes docs/en-US/release-ip-for-vpc.xml | 31 ++++++++--- docs/en-US/remove-tier.xml | 22 ++++---- docs/en-US/remove-vpc.xml | 5 +- docs/en-US/vpc.xml | 4 +- 13 files changed, 181 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/acquire-new-ip-for-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/acquire-new-ip-for-vpc.xml b/docs/en-US/acquire-new-ip-for-vpc.xml index 785e80b..c0cb876 100644 --- a/docs/en-US/acquire-new-ip-for-vpc.xml +++ b/docs/en-US/acquire-new-ip-for-vpc.xml @@ -39,28 +39,43 @@ <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> - </listitem> - <listitem> - <para>Click the Settings icon.</para> <para>The following options are displayed.</para> <itemizedlist> <listitem> - <para>IP Addresses</para> + <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>Gateways</para> + <para>Public IP Addresses</para> </listitem> <listitem> - <para>Site-to-Site VPN</para> + <para>Site-to-Site VPNs</para> </listitem> <listitem> - <para>Network ACLs</para> + <para>Network ACL Lists</para> </listitem> </itemizedlist> </listitem> <listitem> <para>Select IP Addresses.</para> - <para>The IP Addresses page is displayed.</para> + <para>The Public IP Addresses page is displayed.</para> </listitem> <listitem> <para>Click Acquire New IP, and click Yes in the confirmation dialog.</para> @@ -70,4 +85,4 @@ rules.</para> </listitem> </orderedlist> -</section> \ No newline at end of file +</section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/add-gateway-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml index 616794a..a081faf 100644 --- a/docs/en-US/add-gateway-vpc.xml +++ b/docs/en-US/add-gateway-vpc.xml @@ -21,8 +21,8 @@ <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. No gateways with duplicated VLAN and IP are - allowed in the same data center.</para> + 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> @@ -45,16 +45,34 @@ <para>The following options are displayed.</para> <itemizedlist> <listitem> - <para>IP Addresses</para> + <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>Site-to-Site VPN</para> + <para>Public IP Addresses</para> + </listitem> + <listitem> + <para>Site-to-Site VPNs</para> </listitem> <listitem> - <para>Network ACLs</para> + <para>Network ACL Lists</para> </listitem> </itemizedlist> </listitem> @@ -96,9 +114,38 @@ <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. 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> + </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. You can change this default behaviour while creating a + private gateway.</para> + </section> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/add-portforward-rule-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-portforward-rule-vpc.xml b/docs/en-US/add-portforward-rule-vpc.xml index c3dbc39..5b1bb49 100644 --- a/docs/en-US/add-portforward-rule-vpc.xml +++ b/docs/en-US/add-portforward-rule-vpc.xml @@ -35,28 +35,42 @@ <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> - </listitem> - <listitem> - <para>Click the Settings icon.</para> - <para>The following options are displayed.</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>IP Addresses</para> + <para>Private Gateways</para> </listitem> <listitem> - <para>Gateways</para> + <para>Public IP Addresses</para> </listitem> <listitem> - <para>Site-to-Site VPN</para> + <para>Site-to-Site VPNs</para> </listitem> <listitem> - <para>Network ACLs</para> + <para>Network ACL Lists</para> </listitem> </itemizedlist> </listitem> <listitem> - <para>Choose an existing IP address or acquire a new IP address. Click the name of the IP - address in the list.</para> + <para>In the Router node, select Public IP Addresses.</para> <para>The IP Addresses page is displayed.</para> </listitem> <listitem> @@ -95,7 +109,7 @@ <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> + <para>You can test the rule by opening an SSH session to the instance.</para> </listitem> </itemizedlist> </listitem> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/add-tier.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-tier.xml b/docs/en-US/add-tier.xml index 6beaab2..e5334d3 100644 --- a/docs/en-US/add-tier.xml +++ b/docs/en-US/add-tier.xml @@ -41,6 +41,9 @@ </listitem> <listitem> <para>Click the Configure button of the VPC for which you want to set up tiers.</para> + </listitem> + <listitem> + <para>Click Create network.</para> <para>The Add new tier dialog is displayed, as follows:</para> <mediaobject> <imageobject> @@ -62,7 +65,7 @@ </listitem> <listitem> <para><emphasis role="bold">Network Offering</emphasis>: The following default network - offerings are listed: DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, + offerings are listed: Internal LB, DefaultIsolatedNetworkOfferingForVpcNetworksNoLB, DefaultIsolatedNetworkOfferingForVpcNetworks</para> <para>In a VPC, only one tier can be created by using LB-enabled network offering.</para> </listitem> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/add-vm-to-tier.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-vm-to-tier.xml b/docs/en-US/add-vm-to-tier.xml index e401eed..c7d769d 100644 --- a/docs/en-US/add-vm-to-tier.xml +++ b/docs/en-US/add-vm-to-tier.xml @@ -33,13 +33,21 @@ </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.</para> + <para>The VPC page is displayed where all the tiers you have created are listed.</para> </listitem> <listitem> - <para>Click the Add VM button of the tier for which you want to add a VM.</para> + <para>Click Virtual Machines tab of the tier to which you want to add a VM.</para> + <mediaobject> + <imageobject> + <imagedata fileref="./images/add-vm-vpc.png"/> + </imageobject> + <textobject> + <phrase>add-vm-vpc.png: adding a VM to a vpc.</phrase> + </textobject> + </mediaobject> <para>The Add Instance page is displayed.</para> <para>Follow the on-screen instruction to add an instance. For information on adding an - instance, see Adding Instances section in the Installation Guide.</para> + instance, see the Installation Guide.</para> </listitem> </orderedlist> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/enable-disable-static-nat-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/enable-disable-static-nat-vpc.xml b/docs/en-US/enable-disable-static-nat-vpc.xml index 17f0c10..467a304 100644 --- a/docs/en-US/enable-disable-static-nat-vpc.xml +++ b/docs/en-US/enable-disable-static-nat-vpc.xml @@ -42,27 +42,42 @@ <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> - </listitem> - <listitem> - <para>Click the Settings icon.</para> - <para>The following options are displayed.</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>IP Addresses</para> + <para>Private Gateways</para> </listitem> <listitem> - <para>Gateways</para> + <para>Public IP Addresses</para> </listitem> <listitem> - <para>Site-to-Site VPN</para> + <para>Site-to-Site VPNs</para> </listitem> <listitem> - <para>Network ACLs</para> + <para>Network ACL Lists</para> </listitem> </itemizedlist> </listitem> <listitem> - <para>Select IP Addresses.</para> + <para>In the Router node, select Public IP Addresses.</para> <para>The IP Addresses page is displayed.</para> </listitem> <listitem> @@ -74,7 +89,7 @@ <imagedata fileref="./images/enable-disable.png"/> </imageobject> <textobject> - <phrase>enable-disable.png: button to enable Statid NAT.</phrase> + <phrase>enable-disable.png: button to enable Static NAT.</phrase> </textobject> </inlinemediaobject>The button toggles between Enable and Disable, depending on whether static NAT is currently enabled for the IP address.</para> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/images/add-new-gateway-vpc.png ---------------------------------------------------------------------- diff --git a/docs/en-US/images/add-new-gateway-vpc.png b/docs/en-US/images/add-new-gateway-vpc.png index f15b778..5145622 100644 Binary files a/docs/en-US/images/add-new-gateway-vpc.png and b/docs/en-US/images/add-new-gateway-vpc.png differ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/images/add-vm-vpc.png ---------------------------------------------------------------------- diff --git a/docs/en-US/images/add-vm-vpc.png b/docs/en-US/images/add-vm-vpc.png new file mode 100644 index 0000000..b2821a6 Binary files /dev/null and b/docs/en-US/images/add-vm-vpc.png differ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/images/del-tier.png ---------------------------------------------------------------------- diff --git a/docs/en-US/images/del-tier.png b/docs/en-US/images/del-tier.png new file mode 100644 index 0000000..aa9846c Binary files /dev/null and b/docs/en-US/images/del-tier.png differ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/release-ip-for-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/release-ip-for-vpc.xml b/docs/en-US/release-ip-for-vpc.xml index 466ec66..f827b67 100644 --- a/docs/en-US/release-ip-for-vpc.xml +++ b/docs/en-US/release-ip-for-vpc.xml @@ -40,27 +40,42 @@ <para>Click the Configure button of the VPC whose IP you want to release.</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>IP Addresses</para> + <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>Gateways</para> + <para>Public IP Addresses</para> </listitem> <listitem> - <para>Site-to-Site VPN</para> + <para>Site-to-Site VPNs</para> </listitem> <listitem> - <para>Network ACLs</para> + <para>Network ACL Lists</para> </listitem> </itemizedlist> </listitem> <listitem> - <para>Select IP Addresses.</para> + <para>Select Public IP Addresses.</para> <para>The IP Addresses page is displayed.</para> </listitem> <listitem> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/remove-tier.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/remove-tier.xml b/docs/en-US/remove-tier.xml index b5996eb..701645c 100644 --- a/docs/en-US/remove-tier.xml +++ b/docs/en-US/remove-tier.xml @@ -40,16 +40,18 @@ <para>The Configure VPC page is displayed. Locate the tier you want to work with.</para> </listitem> <listitem> - <para>Click the Remove VPC button:</para> - <mediaobject> - <imageobject> - <imagedata fileref="./images/remove-tier.png"/> - </imageobject> - <textobject> - <phrase>remove-tier.png: removing a tier from a vpc.</phrase> - </textobject> - </mediaobject> - <para>Wait for some time for the tier to be removed.</para> + <para>Select the tier you want to remove.</para> + </listitem> + <listitem> + <para>In the Network Details tab, click the Delete Network button. + <inlinemediaobject><imageobject> + <imagedata fileref="./images/del-tier.png"/> + </imageobject> + <textobject> + <phrase>del-tier.png: button to remove a tier</phrase> + </textobject> + </inlinemediaobject></para> + <para>Click Yes to confirm. Wait for some time for the tier to be removed.</para> </listitem> </orderedlist> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/remove-vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/remove-vpc.xml b/docs/en-US/remove-vpc.xml index c5eff85..b373f1a 100644 --- a/docs/en-US/remove-vpc.xml +++ b/docs/en-US/remove-vpc.xml @@ -38,14 +38,15 @@ <para>Select the VPC you want to work with.</para> </listitem> <listitem> - <para>To remove, click the Remove VPC button<inlinemediaobject> + <para>In the Details tab, click the Remove VPC button<inlinemediaobject> <imageobject> <imagedata fileref="./images/remove-vpc.png"/> </imageobject> <textobject> <phrase>remove-vpc.png: button to remove a VPC</phrase> </textobject> - </inlinemediaobject></para> + </inlinemediaobject></para> + <para>You can remove the VPC by also using the remove button in the Quick View.</para> <para>You can edit the name and description of a VPC. To do that, select the VPC, then click the Edit button. <inlinemediaobject> <imageobject> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a011267b/docs/en-US/vpc.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/vpc.xml b/docs/en-US/vpc.xml index 0665d37..7c94f0d 100644 --- a/docs/en-US/vpc.xml +++ b/docs/en-US/vpc.xml @@ -151,8 +151,8 @@ cannot be used for StaticNAT or port forwarding.</para> </listitem> <listitem> - <para>The instances only have a private IP address that you provision. To communicate with the - Internet, enable NAT to an instance that you launch in your VPC.</para> + <para>The instances can only have a private IP address that you provision. To communicate with + the Internet, enable NAT to an instance that you launch in your VPC.</para> </listitem> <listitem> <para>Only new networks can be added to a VPC. The maximum number of networks per VPC is
