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/master to 8339a22
Date Tue, 06 Aug 2013 06:30:54 GMT
Updated Branches:
  refs/heads/master 0eafc0c0d -> 8339a22fe


CLOUDSTACK-3181 and CLOUDSTACK-847


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

Branch: refs/heads/master
Commit: 8339a22febd7956c0434b95a9b021ed016566251
Parents: 0eafc0c
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Authored: Tue Aug 6 11:59:48 2013 +0530
Committer: Radhika PC <radhika.puthiyetath@citrix.com>
Committed: Tue Aug 6 12:00:17 2013 +0530

----------------------------------------------------------------------
 docs/en-US/add-ip-range.xml   | 188 ++++++++++++++++++++++---------------
 docs/en-US/ip-vlan-tenant.xml |   2 +-
 2 files changed, 113 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8339a22f/docs/en-US/add-ip-range.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-ip-range.xml b/docs/en-US/add-ip-range.xml
index 3912bc2..5759ae8 100644
--- a/docs/en-US/add-ip-range.xml
+++ b/docs/en-US/add-ip-range.xml
@@ -19,85 +19,121 @@
     under the License.
 -->
 <section id="add-ip-range">
-  <title>Adding Multiple IP Ranges</title>
-  <note>
-    <para>The feature can only be implemented on IPv4 addresses.</para>
-  </note>
+  <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.</para>
-  <para>Ensure that you manually configure the gateway of the new subnet before adding
the IP range.
-    Note that &PRODUCT; supports only one gateway for a subnet; overlapping subnets are
not
-    currently supported.</para>
-  <para>You can also delete IP ranges. This operation fails if an IP from the remove
range is in
-    use. If the remove range contains the IP address on which the DHCP server is running,
&PRODUCT;
-    acquires a new IP from the same subnet. If no IP is available in the subnet, the remove
-    operation fails.</para>
-  <para>This feature is supported on KVM, xenServer, and VMware hypervisors.</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 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>
+    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>
+      <listitem>
+        <para>Services, such as User Data and Reset SSH Key, runs on the primary IP
of the eth0
+          interface. In the case of multiple subnets, the primary IP is allocated from the
first
+          subnet to the eth0 interface of the virtual router. If virtual router is used for
+          providing DNS service, &PRODUCT;adds an entry, <code>eth0Ip data-server</code>,
in the
+            <code>/etc/hosts</code> directory of the router VM. To access the
User Data and Reset
+          SSH Key services from any additional subnets,  use <code>data-server</code>
instead of
+          using the eth0 IP of the router. </para>
+        <para>For the Reset SSH Key service, the ssh-key reset script has been modified
to fetch the
+          public key by using the name <code>data-server</code> instead of the
eth0 IP of the
+          router. Therefore, if you want to implement the multiple subnet feature, update
the user
+          VM templates with this modified ssh-key restart script. All VMs deployed prior
to using
+          this feature will be able to use the service with the old script. Updating templates
is
+          required only for the VMs that are deployed in the new subnet.</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/blob/8339a22f/docs/en-US/ip-vlan-tenant.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ip-vlan-tenant.xml b/docs/en-US/ip-vlan-tenant.xml
index 0d7a61b..d58d49b 100644
--- a/docs/en-US/ip-vlan-tenant.xml
+++ b/docs/en-US/ip-vlan-tenant.xml
@@ -19,7 +19,7 @@
   under the License.
 -->
 <section id="ip-vlan-tenant">
-  <title>Reserving Public IP Addresses and VLANs for Account</title>
+  <title>Reserving Public IP Addresses and VLANs for Accounts</title>
   <para>&PRODUCT; provides you the ability to reserve a set of public IP addresses
and VLANs
     exclusively for an account. During zone creation, you can continue defining a set of
VLANs and
     multiple public IP ranges. This feature extends the functionality to enable you to dedicate
a


Mime
View raw message