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 011bae7
Date Wed, 03 Jul 2013 10:00:13 GMT
Updated Branches:
  refs/heads/master 79e2c599d -> 011bae7c0


CLOUDSTACK-2808


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

Branch: refs/heads/master
Commit: 011bae7c0a9a6fde90e18ce7777ec679310e5d7b
Parents: 79e2c59
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Authored: Wed Jul 3 15:14:25 2013 +0530
Committer: Radhika PC <radhika.puthiyetath@citrix.com>
Committed: Wed Jul 3 15:29:45 2013 +0530

----------------------------------------------------------------------
 docs/en-US/add-tier.xml                |  9 +++++
 docs/en-US/vlan-assign-isolated-nw.xml | 56 ++++++++++++-----------------
 2 files changed, 32 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/011bae7c/docs/en-US/add-tier.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/add-tier.xml b/docs/en-US/add-tier.xml
index e5334d3..17e02be 100644
--- a/docs/en-US/add-tier.xml
+++ b/docs/en-US/add-tier.xml
@@ -75,6 +75,15 @@
             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>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
+            Networks section in the &PRODUCT; Administration Guide.</para>
+          <para condition="admin">For more information, see <xref linkend="vlan-assign-isolated-nw"
+            />.</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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/011bae7c/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 82fd5b5..2ed0129 100644
--- a/docs/en-US/vlan-assign-isolated-nw.xml
+++ b/docs/en-US/vlan-assign-isolated-nw.xml
@@ -22,51 +22,41 @@
 <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.
-    Additionally, a network with VLAN ID can be excluded from the Network Garbage Collection.</para>
+    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>To enable you to assign VLANs to Isolated networks,</para>
   <orderedlist>
     <listitem>
-      <para>Log in to the CloudPlatform UI as an administrator or end user.</para>
+      <para>Create a network offering by specifying the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Guest Type</emphasis>: Select Isolated.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Specify VLAN</emphasis>: Select the
option.</para>
+        </listitem>
+      </itemizedlist>
+      <para condition="install">For more information, see <xref linkend="creating-network-offerings"
+        />.</para>
+      <para condition="admin">For more information, see the &PRODUCT; Installation
Guide.</para>
     </listitem>
     <listitem>
-      <para>Ensure that the VLAN range does not already exist.</para>
+      <para>Using this network offering, create a network.</para>
+      <para>You can create a VPC tier or an Isolated network.</para>
     </listitem>
     <listitem>
-      <para>Check whether the new VLAN range overlaps with any existing ones. If overlaps,
extend
-        the existing range. If does not overlap, add the new range.</para>
-    </listitem>
-    <listitem>
-      <para>In the left navigation, choose Infrastructure. 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 Add VLAN Ranges button <inlinemediaobject>
-          <imageobject>
-            <imagedata fileref="./images/add-vlan-icon.png"/>
-          </imageobject>
-          <textobject>
-            <phrase>add-vlan-ico.png: button to add a VLAN range.</phrase>
-          </textobject>
-        </inlinemediaobject></para>
-      <para>The Add VLAN Ranges dialog is displayed.</para>
-    </listitem>
-    <listitem>
-      <para>Specify the start and end of the VLAN range.</para>
-    </listitem>
-    <listitem>
-      <para>Click OK.</para>
+      <para>Specify the VLAN when you create the network.</para>
+      <para>When VLAN is specified, a CIDR and gateway are assigned to this network
and the state is
+        changed to Setup. In this state, the network will not be garbage collected.</para>
     </listitem>
   </orderedlist>
+  <note>
+    <para>You cannot change a VLAN once it's assigned to the network. The VLAN remains
with the
+      network for its entire life cycle.</para>
+  </note>
 </section>


Mime
View raw message