Updated Branches:
  refs/heads/4.2 73ec4ede6 -> f0db7aec9

CLOUDSTACK-478


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

Branch: refs/heads/4.2
Commit: f0db7aec98d5d7e84a3f3456b2ea04562ee0090d
Parents: 73ec4ed
Author: Radhika PC <[email protected]>
Authored: Tue Jul 30 17:08:27 2013 +0530
Committer: Radhika PC <[email protected]>
Committed: Tue Jul 30 17:08:27 2013 +0530

----------------------------------------------------------------------
 ...nced-zone-physical-network-configuration.xml |   1 +
 docs/en-US/creating-shared-network.xml          | 132 +++++++++++++++++++
 docs/en-US/isolated-networks.xml                |  25 ++--
 docs/en-US/shared-networks.xml                  |  36 +++--
 4 files changed, 172 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0db7aec/docs/en-US/advanced-zone-physical-network-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-physical-network-configuration.xml 
b/docs/en-US/advanced-zone-physical-network-configuration.xml
index e47c0fd..cfc6184 100644
--- a/docs/en-US/advanced-zone-physical-network-configuration.xml
+++ b/docs/en-US/advanced-zone-physical-network-configuration.xml
@@ -26,4 +26,5 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="configure-public-traffic-in-an-advanced-zone.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="creating-shared-network.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0db7aec/docs/en-US/creating-shared-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/creating-shared-network.xml 
b/docs/en-US/creating-shared-network.xml
new file mode 100644
index 0000000..6c2b504
--- /dev/null
+++ b/docs/en-US/creating-shared-network.xml
@@ -0,0 +1,132 @@
+<?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="creating-shared-network">
+  <title>Configuring a Shared Guest Network</title>
+  <orderedlist>
+    <listitem>
+      <para>Log in to the CloudPlatform UI as administrator.</para>
+    </listitem>
+    <listitem>
+      <para>In the left navigation, choose Infrastructure.</para>
+    </listitem>
+    <listitem>
+      <para>On Zones, click View More.</para>
+    </listitem>
+    <listitem>
+      <para>Click the zone to which you want to add a guest network.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Physical Network tab.</para>
+    </listitem>
+    <listitem>
+      <para>Click the physical network you want to work with.</para>
+    </listitem>
+    <listitem>
+      <para>On the Guest node of the diagram, click Configure.</para>
+    </listitem>
+    <listitem>
+      <para>Click the Network tab.</para>
+    </listitem>
+    <listitem>
+      <para>Click Add guest network.</para>
+      <para>The Add guest network window is displayed.</para>
+    </listitem>
+    <listitem>
+      <para>Specify the following:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name</emphasis>: The name of the 
network. This will be visible
+            to the user.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Description</emphasis>: The short 
description of the network
+            that can be displayed to users.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN ID</emphasis>: The unique ID of the 
VLAN.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Isolated VLAN ID</emphasis>: The unique 
ID of the Secondary
+            Isolated VLAN. </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Scope</emphasis>: The available scopes 
are Domain, Account,
+            Project, and All.</para>
+          <itemizedlist>
+            <listitem>
+              <para><emphasis role="bold">Domain</emphasis>: Selecting Domain 
limits the scope of
+                this guest network to the domain you specify. The network will 
not be available for
+                other domains. If you select Subdomain Access, the guest 
network is available to all
+                the sub domains within the selected domain.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Account</emphasis>: The account for 
which the guest
+                network is being created for. You must specify the domain the 
account belongs
+                to.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">Project</emphasis>: The project for 
which the guest
+                network is being created for. You must specify the domain the 
project belongs
+                to.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold">All</emphasis>: The guest network is 
available for all the
+                domains, account, projects within the selected zone. </para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Offering</emphasis>: If the 
administrator has
+            configured multiple network offerings, select the one you want to 
use for this
+            network.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Gateway</emphasis>: The gateway that the 
guests should
+            use.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask</emphasis>: The netmask in use 
on the subnet the
+            guests will use.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">IP Range</emphasis>: A range of IP 
addresses that are
+            accessible from the Internet and are assigned to the guest 
VMs.</para>
+          <para>If one NIC is used, these IPs should be in the same CIDR in 
the case of IPv6.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">IPv6 CIDR</emphasis>: The network prefix 
that defines the
+            guest network subnet. This is the CIDR that describes the IPv6 
addresses in use in the
+            guest networks in this zone. To allot IP addresses from within a 
particular address
+            block, enter a CIDR.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Domain</emphasis>: A custom DNS 
suffix at the level of
+            a network. If you want to assign a special domain name to the 
guest VM network, specify
+            a DNS suffix.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Click OK to confirm.</para>
+    </listitem>
+  </orderedlist>
+</section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0db7aec/docs/en-US/isolated-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/isolated-networks.xml b/docs/en-US/isolated-networks.xml
index 671591d..c856044 100644
--- a/docs/en-US/isolated-networks.xml
+++ b/docs/en-US/isolated-networks.xml
@@ -22,13 +22,20 @@
     under the License.
 -->
 <section id="isolated-networks">
-    <title>Isolated Networks</title>
-    <para>An isolated network can be accessed only by virtual machines of a 
single account. Isolated networks have the following properties.</para>
-    <itemizedlist>
-        <listitem><para>Resources such as VLAN are allocated and garbage 
collected dynamically</para></listitem>
-        <listitem><para>There is one network offering for the entire 
network</para></listitem>
-        <listitem><para>The network offering can be upgraded or downgraded but 
it is for the entire network</para></listitem>
-        </itemizedlist>
-    
-    
+  <title>Isolated Networks</title>
+  <para>An isolated network can be accessed only by virtual machines of a 
single account. Isolated
+    networks have the following properties.</para>
+  <itemizedlist>
+    <listitem>
+      <para>Resources such as VLAN are allocated and garbage collected 
dynamically</para>
+    </listitem>
+    <listitem>
+      <para>There is one network offering for the entire network</para>
+    </listitem>
+    <listitem>
+      <para>The network offering can be upgraded or downgraded but it is for 
the entire
+        network</para>
+    </listitem>
+  </itemizedlist>
+  <para>For more information, see <xref 
linkend="configure-guest-traffic-in-advanced-zone"/>.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0db7aec/docs/en-US/shared-networks.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/shared-networks.xml b/docs/en-US/shared-networks.xml
index 4c32320..65657ce 100644
--- a/docs/en-US/shared-networks.xml
+++ b/docs/en-US/shared-networks.xml
@@ -22,17 +22,27 @@
     under the License.
 -->
 <section id="shared-networks">
-    <title>Shared Networks</title>
-    <para>A shared network can be accessed by virtual machines that belong to 
many different
-        accounts. Network Isolation on shared networks is accomplished using 
techniques such as
-        security groups (supported only in basic zones).</para>
-    <itemizedlist>
-        <listitem><para>Shared Networks are created by the 
administrator</para></listitem>
-        <listitem><para>Shared Networks can be designated to a certain 
domain</para></listitem>
-        <listitem><para>Shared Network resources such as VLAN and physical 
network that it maps to are designated by the administrator</para></listitem>
-        <listitem><para>Shared Networks are isolated by security 
groups</para></listitem>
-        <listitem><para>Public Network is a shared network that is not shown 
to the end users</para></listitem>
-        </itemizedlist>
-    
-    
+  <title>Shared Networks</title>
+  <para>A shared network can be accessed by virtual machines that belong to 
many different accounts.
+    Network Isolation on shared networks is accomplished using techniques such 
as security groups
+    (supported only in basic zones).</para>
+  <itemizedlist>
+    <listitem>
+      <para>Shared Networks are created by the administrator</para>
+    </listitem>
+    <listitem>
+      <para>Shared Networks can be designated to a certain domain</para>
+    </listitem>
+    <listitem>
+      <para>Shared Network resources such as VLAN and physical network that it 
maps to are
+        designated by the administrator</para>
+    </listitem>
+    <listitem>
+      <para>Shared Networks are isolated by security groups</para>
+    </listitem>
+    <listitem>
+      <para>Public Network is a shared network that is not shown to the end 
users</para>
+    </listitem>
+  </itemizedlist>
+  <para>For information, see <xref linkend="creating-shared-network"/>.</para>
 </section>

Reply via email to