You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/07/17 06:54:53 UTC

git commit: updated refs/heads/4.2 to 3c0c47c

Updated Branches:
  refs/heads/4.2 feb132534 -> 3c0c47cb0


CLOUDSTACK-2808


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

Branch: refs/heads/4.2
Commit: 3c0c47cb0532a650df55984a42459e1cf7dcc217
Parents: feb1325
Author: radhikap <ra...@citrix.com>
Authored: Wed Jul 17 10:24:33 2013 +0530
Committer: radhikap <ra...@citrix.com>
Committed: Wed Jul 17 10:24:33 2013 +0530

----------------------------------------------------------------------
 docs/en-US/creating-network-offerings.xml |  4 +-
 docs/en-US/networks.xml                   |  2 +
 docs/en-US/vlan-assign-isolated-nw.xml    | 62 ++++++++++++++++++++++++++
 docs/en-US/vlan-provisioning.xml          |  1 +
 4 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c0c47cb/docs/en-US/creating-network-offerings.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml
index 260751e..6e25b27 100644
--- a/docs/en-US/creating-network-offerings.xml
+++ b/docs/en-US/creating-network-offerings.xml
@@ -68,7 +68,9 @@
         </listitem>
         <listitem>
           <para><emphasis role="bold">Specify VLAN</emphasis>. (Isolated guest networks only)
-            Indicate whether a VLAN should be specified when this offering is used.</para>
+            Indicate whether a VLAN could be specified when this offering is used. If you select
+            this option and later use this network offering while creating a VPC tier or an isolated
+            network, you will be able to specify a VLAN ID for the network you create.</para>
         </listitem>
         <listitem>
           <para><emphasis role="bold">VPC</emphasis>. This option indicate whether the guest network

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c0c47cb/docs/en-US/networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml
index d1fc541..5d0c82a 100644
--- a/docs/en-US/networks.xml
+++ b/docs/en-US/networks.xml
@@ -48,6 +48,8 @@
   <xi:include href="dns-dhcp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="vpn.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="elastic-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="portable-ip.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="add-ip-range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="pvlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="inter-vlan-routing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="configure-vpc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c0c47cb/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
new file mode 100644
index 0000000..2ed0129
--- /dev/null
+++ b/docs/en-US/vlan-assign-isolated-nw.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>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>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>Using this network offering, create a network.</para>
+      <para>You can create a VPC tier or an Isolated network.</para>
+    </listitem>
+    <listitem>
+      <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>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c0c47cb/docs/en-US/vlan-provisioning.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vlan-provisioning.xml b/docs/en-US/vlan-provisioning.xml
index d37be16..2d1a49e 100644
--- a/docs/en-US/vlan-provisioning.xml
+++ b/docs/en-US/vlan-provisioning.xml
@@ -42,4 +42,5 @@
     and the guest networks on different physical NICs.</para>
   <xi:include href="vlan-allocation-eg.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="non-contiguous-vlan.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="vlan-assign-isolated-nw.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </section>