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 7c7faa6
Date Thu, 12 Sep 2013 06:02:24 GMT
Updated Branches:
  refs/heads/master cb3a3da75 -> 7c7faa627


vmware dvswitch update, UI has changed for traffic label CLOUDSTACK-4089 doc changes


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

Branch: refs/heads/master
Commit: 7c7faa627aa125490320a78d5ded6eb5f64e428d
Parents: cb3a3da
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Thu Sep 12 11:23:47 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Thu Sep 12 11:32:01 2013 +0530

----------------------------------------------------------------------
 docs/en-US/advanced-zone-configuration.xml    |  17 +-
 docs/en-US/basic-zone-configuration.xml       | 414 +++++++++++++++------
 docs/en-US/images/edit-traffic-type.png       | Bin 0 -> 93662 bytes
 docs/en-US/images/traffic-type.png            | Bin 0 -> 19159 bytes
 docs/en-US/vmware-cluster-config-dvswitch.xml |  78 ++--
 5 files changed, 359 insertions(+), 150 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c7faa62/docs/en-US/advanced-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml
index 43b9391..451b545 100644
--- a/docs/en-US/advanced-zone-configuration.xml
+++ b/docs/en-US/advanced-zone-configuration.xml
@@ -84,6 +84,14 @@
       <para>These traffic labels will be defined only for the hypervisor selected for
the first
         cluster. For all other hypervisors, the labels can be configured after the zone is
         created.</para>
+      <para>(VMware only) If you have enabled Nexus dvSwitch in the environment, you
must specify
+        the corresponding Ethernet port profile names as network traffic label for each traffic
type
+        on the physical network. For more information on Nexus dvSwitch, see Configuring
a vSphere
+        Cluster with Nexus 1000v Virtual Switch in the Installation Guide. If you have enabled
+        VMware dvSwitch in the environment, you must specify the corresponding Switch name
as
+        network traffic label for each traffic type on the physical network. For more information,
+        see Configuring a VMware Datacenter with VMware Distributed Virtual Switch in the
+        Installation Guide. </para>
     </listitem>
     <listitem>
       <para>Click Next.</para>
@@ -219,9 +227,9 @@
         </listitem>
         <listitem>
           <para><emphasis role="bold">Protocol.</emphasis> For XenServer,
choose either NFS, iSCSI,
-            or PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, and RBD. For vSphere
choose either VMFS
-            (iSCSI or FiberChannel) or NFS. The remaining fields in the screen vary depending
on
-            what you choose here.</para>
+            or PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, and RBD. For vSphere
choose
+            either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields in the screen
vary
+            depending on what you choose here.</para>
           <informaltable frame="all">
             <tgroup cols="2" align="left" colsep="1" rowsep="1">
               <colspec colname="c1"/>
@@ -362,7 +370,8 @@
         Secondary Storage :</para>
       <itemizedlist>
         <listitem>
-          <para><emphasis role="bold">NFS Server.</emphasis> The IP address
of the server or fully qualified domain name of the server.</para>
+          <para><emphasis role="bold">NFS Server.</emphasis> The IP address
of the server or fully
+            qualified domain name of the server.</para>
         </listitem>
         <listitem>
           <para><emphasis role="bold">Path.</emphasis> The exported path
from the server.</para>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c7faa62/docs/en-US/basic-zone-configuration.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/basic-zone-configuration.xml b/docs/en-US/basic-zone-configuration.xml
index 965aff3..79d4ab8 100644
--- a/docs/en-US/basic-zone-configuration.xml
+++ b/docs/en-US/basic-zone-configuration.xml
@@ -22,124 +22,298 @@
     under the License.
 -->
 <section id="basic-zone-configuration">
-	<title>Basic Zone Configuration</title>
-    <orderedlist>
-        <listitem><para>After you select Basic in the Add Zone wizard and click
Next, you will be asked to enter the following details. Then click Next.</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Name.</emphasis>
A name for the zone.</para></listitem>
-                <listitem><para><emphasis role="bold">DNS 1 and 2.</emphasis>
These are DNS servers for use by guest VMs in the zone. These DNS servers will be accessed
via the public network you will add later. The public IP addresses for the zone must have
a route to the DNS server named here.</para></listitem>
-                <listitem><para><emphasis role="bold">Internal DNS 1 and
Internal DNS 2.</emphasis> These are DNS servers for use by system VMs in the zone (these
are VMs used by &PRODUCT; itself, such as virtual routers, console proxies, and Secondary
Storage VMs.) These DNS servers will be accessed via the management traffic network interface
of the System VMs. The private IP address you provide for the pods must have a route to the
internal DNS server named here.</para></listitem>
-                <listitem><para><emphasis role="bold">Hypervisor.</emphasis>
(Introduced in version 3.0.1) Choose the hypervisor for the first cluster in the zone. You
can add clusters with different hypervisors later, after you finish adding the zone.</para></listitem>
-                <listitem><para><emphasis role="bold">Network Offering.</emphasis>
Your choice here determines what network services will be available on the network for guest
VMs.</para>
-                    <informaltable frame="all">
-                        <tgroup cols="2" align="left" colsep="1" rowsep="1">
-                            <colspec colname="c1" />
-                            <colspec colname="c2" />
-                            <thead>
-                                <row>
-                                    <entry><para>Network Offering</para></entry>
-                                    <entry><para>Description</para></entry>
-                                </row>
-                            </thead>
-                            <tbody>
-                                <row>
-                                    <entry><para>DefaultSharedNetworkOfferingWithSGService</para></entry>
-                                    <entry><para>If you want to enable security
groups for guest traffic isolation, choose this. (See Using Security Groups to Control Traffic
to VMs.)</para></entry>
-                                </row>
-                                <row>
-                                    <entry><para>DefaultSharedNetworkOffering</para></entry>
-                                    <entry><para>If you do not need security
groups, choose this.</para></entry>
-                                </row>                                
-                                <row>
-                                    <entry><para>DefaultSharedNetscalerEIPandELBNetworkOffering</para></entry>
-                                    <entry><para>If you have installed a Citrix
NetScaler appliance as part of your zone network, and you will be using its Elastic IP and
Elastic Load Balancing features, choose this. With the EIP and ELB features, a basic zone
with security groups enabled can offer 1:1 static NAT and load balancing.</para></entry>
-                                </row>
-                            </tbody>
-                        </tgroup>
-                    </informaltable>
-                </listitem>
-                <listitem><para><emphasis role="bold">Network Domain.</emphasis>
(Optional) If you want to assign a special domain name to the guest VM network, specify the
DNS suffix.</para></listitem>
-                <listitem><para><emphasis role="bold">Public.</emphasis>
A public zone is available to all users. A zone that is not public will be assigned to a particular
domain.  Only users in that domain will be allowed to create guest VMs in this zone.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>Choose which traffic types will be carried by the physical
network.</para>
-            <para>The traffic types are management, public, guest, and storage traffic.
For more information about the types, roll over the icons to display their tool tips, or see
Basic Zone Network Traffic Types. This screen starts out with some traffic types already assigned.
To add more, drag and drop traffic types onto the network. You can also change the network
name if desired.</para>
-        </listitem>
-        <listitem><para>Assign a network traffic label to each traffic type on
the physical network. These labels must match the labels you have already defined on the hypervisor
host. To assign each label, click the Edit button under the traffic type icon. A popup dialog
appears where you can type the label, then click OK.</para>
-            <para>These traffic labels will be defined only for the hypervisor selected
for the first cluster. For all other hypervisors, the labels can be configured after the zone
is created.</para>
-        </listitem>
-        <listitem><para>Click Next.</para></listitem>
-        <listitem><para>(NetScaler only) If you chose the network offering for
NetScaler, you have an additional screen to fill out. Provide the requested details to set
up the NetScaler, then click Next.</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">IP address.</emphasis>
The NSIP (NetScaler IP) address of the NetScaler device.</para></listitem>
-                <listitem><para><emphasis role="bold">Username/Password.</emphasis>
The authentication credentials to access the device. &PRODUCT; uses these credentials
to access the device.</para></listitem>
-                <listitem><para><emphasis role="bold">Type.</emphasis>
NetScaler device type that is being added. It could be NetScaler VPX, NetScaler MPX, or NetScaler
SDX. For a comparison of the types, see About Using a NetScaler Load Balancer.</para></listitem>
-                <listitem><para><emphasis role="bold">Public interface.</emphasis>
Interface of NetScaler that is configured to be part of the public network.</para></listitem>
-                <listitem><para><emphasis role="bold">Private interface.</emphasis>
Interface of NetScaler that is configured to be part of the private network.</para></listitem>
-                <listitem><para><emphasis role="bold">Number of retries.</emphasis>
Number of times to attempt a command on the device before considering the operation failed.
Default is 2.</para></listitem>
-                <listitem><para><emphasis role="bold">Capacity.</emphasis>
Number of guest networks/accounts that will share this NetScaler device.</para></listitem>
-                <listitem><para><emphasis role="bold">Dedicated.</emphasis>
When marked as dedicated, this device will be dedicated to a single account. When Dedicated
is checked, the value in the Capacity field has no significance – implicitly, its value
is 1.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>(NetScaler only) Configure the IP range for public traffic.
The IPs in this range will be used for the static NAT capability which you enabled by selecting
the network offering for NetScaler with EIP and ELB. Enter the following details, then click
Add. If desired, you can repeat this step to add more IP ranges. When done, click Next.</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Gateway.</emphasis>
The gateway in use for these IP addresses.</para></listitem>
-                <listitem><para><emphasis role="bold">Netmask.</emphasis>
The netmask associated with this IP range.</para></listitem>
-                <listitem><para><emphasis role="bold">VLAN.</emphasis>
The VLAN that will be used for public traffic.</para></listitem>
-                <listitem><para><emphasis role="bold">Start IP/End IP.</emphasis>
A range of IP addresses that are assumed to be accessible from the Internet and will be allocated
for access to guest VMs.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>In a new zone, &PRODUCT; adds the first pod for you.
You can always add more pods later. For an overview of what a pod is, see <xref linkend="about-pods"
/>.</para>
-            <para>To configure the first pod, enter the following, then click Next:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Pod Name.</emphasis>
A name for the pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Reserved system gateway.</emphasis>
The gateway for the hosts in that pod.</para></listitem>
-                <listitem><para><emphasis role="bold">Reserved system netmask.</emphasis>
The network prefix that defines the pod's subnet. Use CIDR notation.</para></listitem>
-                <listitem><para><emphasis role="bold">Start/End Reserved
System IP.</emphasis> The IP range in the management network that &PRODUCT; uses
to manage various system VMs, such as Secondary Storage VMs, Console Proxy VMs, and DHCP.
For more information, see System Reserved IP Addresses.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>Configure the network for guest traffic. Provide the
following, then click Next:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Guest gateway.</emphasis>
The gateway that the guests should use.</para></listitem>
-                <listitem><para><emphasis role="bold">Guest netmask.</emphasis>
The netmask in use on the subnet the guests will use.</para></listitem>
-                <listitem><para><emphasis role="bold">Guest start IP/End
IP.</emphasis> Enter the first and last IP addresses that define a range that &PRODUCT;
can assign to guests.</para>
-                    <itemizedlist>
-                        <listitem><para>We strongly recommend the use of multiple
NICs. If multiple NICs are used, they may be in a different subnet.</para></listitem>
-                        <listitem><para>If one NIC is used, these IPs should
be in the same CIDR as the pod CIDR.</para></listitem>
-                    </itemizedlist>
-                </listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>In a new pod, &PRODUCT; adds the first cluster for
you. You can always add more clusters later. For an overview of what a cluster is, see About
Clusters.</para>
-            <para>To configure the first cluster, enter the following, then click Next:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Hypervisor.</emphasis>
(Version 3.0.0 only; in 3.0.1, this field is read only) Choose the type of hypervisor software
that all hosts in this cluster will run. If you choose VMware, additional fields appear so
you can give information about a vSphere cluster. For vSphere servers, we recommend creating
the cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;. See Add
Cluster: vSphere.</para></listitem>
-                <listitem><para><emphasis role="bold">Cluster name.</emphasis>
Enter a name for the cluster.  This can be text of your choosing and is not used by &PRODUCT;.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>In a new cluster, &PRODUCT; adds the first host for
you. You can always add more hosts later. For an overview of what a host is, see About Hosts.</para>
-            <note><para>When you add a hypervisor host to &PRODUCT;, the
host must not have any VMs already running.</para></note>
-            <para>Before you can configure the host, you need to install the hypervisor
software on the host. You will need to know which version of the hypervisor software version
is supported by &PRODUCT; and what additional configuration is required to ensure the
host will work with &PRODUCT;. To find these installation details, see:</para>
-            <itemizedlist>
-                <listitem><para>Citrix XenServer Installation and Configuration</para></listitem>
-                <listitem><para>VMware vSphere Installation and Configuration</para></listitem>
-                <listitem><para>KVM vSphere Installation and Configuration</para></listitem>
-                <!-- <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
-->
-            </itemizedlist>
-            <para>To configure the first host, enter the following, then click Next:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Host Name.</emphasis>
The DNS name or IP address of the host.</para></listitem>
-                <listitem><para><emphasis role="bold">Username.</emphasis>
The username is root.</para></listitem>
-                <listitem><para><emphasis role="bold">Password.</emphasis>
This is the password for the user named above (from your XenServer or KVM install).</para></listitem>
-                <listitem><para><emphasis role="bold">Host Tags.</emphasis>
(Optional) Any labels that you use to categorize hosts for ease of maintenance. For example,
you can set this to the cloud's HA tag (set in the ha.tag global configuration parameter)
if you want this host to be used only for VMs with the "high availability" feature enabled.
For more information, see HA-Enabled Virtual Machines as well as HA for Hosts.</para></listitem>
-            </itemizedlist>
-        </listitem>
-        <listitem><para>In a new cluster, &PRODUCT; adds the first primary
storage server for you. You can always add more servers later. For an overview of what primary
storage is, see About Primary Storage.</para>
-            <para>To configure the first primary storage server, enter the following,
then click Next:</para>
-            <itemizedlist>
-                <listitem><para><emphasis role="bold">Name.</emphasis>
The name of the storage device.</para></listitem>
-                <listitem><para><emphasis role="bold">Protocol.</emphasis>
For XenServer, choose either NFS, iSCSI, or PreSetup.  For KVM, choose NFS, SharedMountPoint,CLVM,
or RBD.  For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields
in the screen vary depending on what you choose here.</para></listitem>
-            </itemizedlist>
-        </listitem>
-    </orderedlist>
+  <title>Basic Zone Configuration</title>
+  <orderedlist>
+    <listitem>
+      <para>After you select Basic in the Add Zone wizard and click Next, you will
be asked to enter
+        the following details. Then click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> A name for the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">DNS 1 and 2.</emphasis> These are
DNS servers for use by guest
+            VMs in the zone. These DNS servers will be accessed via the public network you
will add
+            later. The public IP addresses for the zone must have a route to the DNS server
named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Internal DNS 1 and Internal DNS 2.</emphasis>
These are DNS
+            servers for use by system VMs in the zone (these are VMs used by &PRODUCT;
itself, such
+            as virtual routers, console proxies, and Secondary Storage VMs.) These DNS servers
will
+            be accessed via the management traffic network interface of the System VMs. The
private
+            IP address you provide for the pods must have a route to the internal DNS server
named
+            here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Introduced
in version 3.0.1) Choose
+            the hypervisor for the first cluster in the zone. You can add clusters with different
+            hypervisors later, after you finish adding the zone.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Offering.</emphasis> Your
choice here determines what
+            network services will be available on the network for guest VMs.</para>
+          <informaltable frame="all">
+            <tgroup cols="2" align="left" colsep="1" rowsep="1">
+              <colspec colname="c1"/>
+              <colspec colname="c2"/>
+              <thead>
+                <row>
+                  <entry><para>Network Offering</para></entry>
+                  <entry><para>Description</para></entry>
+                </row>
+              </thead>
+              <tbody>
+                <row>
+                  <entry><para>DefaultSharedNetworkOfferingWithSGService</para></entry>
+                  <entry><para>If you want to enable security groups for guest
traffic isolation,
+                      choose this. (See Using Security Groups to Control Traffic to
+                    VMs.)</para></entry>
+                </row>
+                <row>
+                  <entry><para>DefaultSharedNetworkOffering</para></entry>
+                  <entry><para>If you do not need security groups, choose this.</para></entry>
+                </row>
+                <row>
+                  <entry><para>DefaultSharedNetscalerEIPandELBNetworkOffering</para></entry>
+                  <entry><para>If you have installed a Citrix NetScaler appliance
as part of your
+                      zone network, and you will be using its Elastic IP and Elastic Load
Balancing
+                      features, choose this. With the EIP and ELB features, a basic zone
with
+                      security groups enabled can offer 1:1 static NAT and load
+                    balancing.</para></entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Network Domain.</emphasis> (Optional)
If you want to assign a
+            special domain name to the guest VM network, specify the DNS suffix.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public.</emphasis> A public zone
is available to all users. A
+            zone that is not public will be assigned to a particular domain. Only users in
that
+            domain will be allowed to create guest VMs in this zone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Choose which traffic types will be carried by the physical network.</para>
+      <para>The traffic types are management, public, guest, and storage traffic. For
more
+        information about the types, roll over the icons to display their tool tips, or see
Basic
+        Zone Network Traffic Types. This screen starts out with some traffic types already
assigned.
+        To add more, drag and drop traffic types onto the network. You can also change the
network
+        name if desired.</para>
+    </listitem>
+    <listitem>
+      <para>Assign a network traffic label to each traffic type on the physical network.
These
+        labels must match the labels you have already defined on the hypervisor host. To
assign each
+        label, click the Edit button under the traffic type icon. A popup dialog appears
where you
+        can type the label, then click OK.</para>
+      <para>These traffic labels will be defined only for the hypervisor selected for
the first
+        cluster. For all other hypervisors, the labels can be configured after the zone is
+        created.</para>
+    </listitem>
+    <listitem>
+      <para>Click Next.</para>
+    </listitem>
+    <listitem>
+      <para>(NetScaler only) If you chose the network offering for NetScaler, you have
an additional
+        screen to fill out. Provide the requested details to set up the NetScaler, then click
+        Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">IP address.</emphasis> The NSIP (NetScaler
IP) address of the
+            NetScaler device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Username/Password.</emphasis> The
authentication credentials
+            to access the device. &PRODUCT; uses these credentials to access the device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Type.</emphasis> NetScaler device
type that is being added. It
+            could be NetScaler VPX, NetScaler MPX, or NetScaler SDX. For a comparison of
the types,
+            see About Using a NetScaler Load Balancer.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Public interface.</emphasis> Interface
of NetScaler that is
+            configured to be part of the public network.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Private interface.</emphasis> Interface
of NetScaler that is
+            configured to be part of the private network.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Number of retries.</emphasis> Number
of times to attempt a
+            command on the device before considering the operation failed. Default is 2.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Capacity.</emphasis> Number of guest
networks/accounts that
+            will share this NetScaler device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Dedicated.</emphasis> When marked
as dedicated, this device
+            will be dedicated to a single account. When Dedicated is checked, the value in
the
+            Capacity field has no significance – implicitly, its value is 1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>(NetScaler only) Configure the IP range for public traffic. The IPs in
this range will
+        be used for the static NAT capability which you enabled by selecting the network
offering
+        for NetScaler with EIP and ELB. Enter the following details, then click Add. If desired,
you
+        can repeat this step to add more IP ranges. When done, click Next.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Gateway.</emphasis> The gateway in
use for these IP
+            addresses.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Netmask.</emphasis> The netmask associated
with this IP
+            range.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">VLAN.</emphasis> The VLAN that will
be used for public
+            traffic.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start IP/End IP.</emphasis> A range
of IP addresses that are
+            assumed to be accessible from the Internet and will be allocated for access to
guest
+            VMs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new zone, &PRODUCT; adds the first pod for you. You can always
add more pods later.
+        For an overview of what a pod is, see <xref linkend="about-pods"/>.</para>
+      <para>To configure the first pod, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Pod Name.</emphasis> A name for the
pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system gateway.</emphasis>
The gateway for the hosts
+            in that pod.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Reserved system netmask.</emphasis>
The network prefix that
+            defines the pod's subnet. Use CIDR notation.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Start/End Reserved System IP.</emphasis>
The IP range in the
+            management network that &PRODUCT; uses to manage various system VMs, such
as Secondary
+            Storage VMs, Console Proxy VMs, and DHCP. For more information, see System Reserved
IP
+            Addresses.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>Configure the network for guest traffic. Provide the following, then click
Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Guest gateway.</emphasis> The gateway
that the guests should
+            use.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest netmask.</emphasis> The netmask
in use on the subnet the
+            guests will use.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Guest start IP/End IP.</emphasis>
Enter the first and last IP
+            addresses that define a range that &PRODUCT; can assign to guests.</para>
+          <itemizedlist>
+            <listitem>
+              <para>We strongly recommend the use of multiple NICs. If multiple NICs
are used, they
+                may be in a different subnet.</para>
+            </listitem>
+            <listitem>
+              <para>If one NIC is used, these IPs should be in the same CIDR as the
pod CIDR.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new pod, &PRODUCT; adds the first cluster for you. You can always
add more clusters
+        later. For an overview of what a cluster is, see About Clusters.</para>
+      <para>To configure the first cluster, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Hypervisor.</emphasis> (Version 3.0.0
only; in 3.0.1, this
+            field is read only) Choose the type of hypervisor software that all hosts in
this
+            cluster will run. If you choose VMware, additional fields appear so you can give
+            information about a vSphere cluster. For vSphere servers, we recommend creating
the
+            cluster of hosts in vCenter and then adding the entire cluster to &PRODUCT;.
See Add
+            Cluster: vSphere.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Cluster name.</emphasis> Enter a
name for the cluster. This
+            can be text of your choosing and is not used by &PRODUCT;.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first host for you. You can always
add more hosts
+        later. For an overview of what a host is, see About Hosts.</para>
+      <note>
+        <para>When you add a hypervisor host to &PRODUCT;, the host must not have
any VMs already
+          running.</para>
+      </note>
+      <para>Before you can configure the host, you need to install the hypervisor software
on the
+        host. You will need to know which version of the hypervisor software version is supported
by
+        &PRODUCT; and what additional configuration is required to ensure the host will
work with
+        &PRODUCT;. To find these installation details, see:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Citrix XenServer Installation and Configuration</para>
+        </listitem>
+        <listitem>
+          <para>VMware vSphere Installation and Configuration</para>
+        </listitem>
+        <listitem>
+          <para>KVM vSphere Installation and Configuration</para>
+        </listitem>
+        <!-- <listitem><para>Oracle VM (OVM) Installation and Configuration</para></listitem>
-->
+      </itemizedlist>
+      <para>To configure the first host, enter the following, then click Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Host Name.</emphasis> The DNS name
or IP address of the
+            host.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Username.</emphasis> The username
is root.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password.</emphasis> This is the
password for the user named
+            above (from your XenServer or KVM install).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Host Tags.</emphasis> (Optional)
Any labels that you use to
+            categorize hosts for ease of maintenance. For example, you can set this to the
cloud's
+            HA tag (set in the ha.tag global configuration parameter) if you want this host
to be
+            used only for VMs with the "high availability" feature enabled. For more information,
+            see HA-Enabled Virtual Machines as well as HA for Hosts.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
+      <para>In a new cluster, &PRODUCT; adds the first primary storage server for
you. You can
+        always add more servers later. For an overview of what primary storage is, see About
Primary
+        Storage.</para>
+      <para>To configure the first primary storage server, enter the following, then
click
+        Next:</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Name.</emphasis> The name of the
storage device.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Protocol.</emphasis> For XenServer,
choose either NFS, iSCSI,
+            or PreSetup. For KVM, choose NFS, SharedMountPoint,CLVM, or RBD. For vSphere
choose
+            either VMFS (iSCSI or FiberChannel) or NFS. The remaining fields in the screen
vary
+            depending on what you choose here.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </orderedlist>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c7faa62/docs/en-US/images/edit-traffic-type.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/edit-traffic-type.png b/docs/en-US/images/edit-traffic-type.png
new file mode 100644
index 0000000..16cda94
Binary files /dev/null and b/docs/en-US/images/edit-traffic-type.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c7faa62/docs/en-US/images/traffic-type.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/traffic-type.png b/docs/en-US/images/traffic-type.png
new file mode 100644
index 0000000..10d5ddb
Binary files /dev/null and b/docs/en-US/images/traffic-type.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c7faa62/docs/en-US/vmware-cluster-config-dvswitch.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vmware-cluster-config-dvswitch.xml b/docs/en-US/vmware-cluster-config-dvswitch.xml
index 311673a..2aeea2a 100644
--- a/docs/en-US/vmware-cluster-config-dvswitch.xml
+++ b/docs/en-US/vmware-cluster-config-dvswitch.xml
@@ -75,27 +75,52 @@
         <phrase>vds-name.png: Name of the dvSwitch as specified in the vCenter.</phrase>
       </textobject>
     </mediaobject>
-    <para>Use this VDS name when you specify the switch name in the traffic label while
creating the
-      zone. Traffic label format is [["Name of vSwitch/dvSwitch/EthernetPortProfile"][,"VLAN
-      ID"[,"vSwitch Type"]]]</para>
+    <para>Use this VDS name in the following:</para>
+    <itemizedlist>
+         <listitem>
+        <para>The switch name in the Edit traffic label dialog while configuring a
public and guest
+        traffic during zone creation.</para>
+        <para>During a zone creation, ensure that you select VMware vNetwork Distributed
Virtual Switch
+          when you configure guest and public traffic type.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="./images/traffic-type.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>traffic-type.png: virtual switch type</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+      <listitem>
+        <para>The Public Traffic vSwitch Type field when you add a VMware VDS-enabled
cluster. </para>
+      </listitem>
+      <listitem>
+        <para>The switch name in the traffic label while updating the switch type in
a zone.</para>
+      </listitem>
+    </itemizedlist>
+    <para>Traffic label format in the last case is [["Name of
+      vSwitch/dvSwitch/EthernetPortProfile"][,"VLAN ID"[,"vSwitch Type"]]]</para>
     <para>The possible values for traffic labels are:</para>
     <itemizedlist>
-      <listitem><para>empty string</para></listitem>
-      <listitem><para>dvSwitch0</para></listitem>
-      <listitem><para> dvSwitch0,200</para></listitem>
-      <listitem><para>dvSwitch1,300,vmwaredvs</para></listitem>
-      <listitem><para>myEthernetPortProfile,,nexusdvs</para></listitem>
-      <listitem><para>dvSwitch0,,vmwaredvs</para></listitem>
+      <listitem>
+        <para>empty string</para>
+      </listitem>
+      <listitem>
+        <para>dvSwitch0</para>
+      </listitem>
+      <listitem>
+        <para> dvSwitch0,200</para>
+      </listitem>
+      <listitem>
+        <para>dvSwitch1,300,vmwaredvs</para>
+      </listitem>
+      <listitem>
+        <para>myEthernetPortProfile,,nexusdvs</para>
+      </listitem>
+      <listitem>
+        <para>dvSwitch0,,vmwaredvs</para>
+      </listitem>
     </itemizedlist>
-    
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="./images/traffic-label.png"/>
-      </imageobject>
-      <textobject>
-        <phrase>traffic-label.png: Traffic label specified while zone creation.</phrase>
-      </textobject>
-    </mediaobject>
     <informaltable frame="all">
       <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <colspec colname="c1"/>
@@ -124,10 +149,10 @@
           <row>
             <entry><para>2</para></entry>
             <entry><para>VLAN ID to be used for this traffic wherever applicable.</para></entry>
-            <entry><para>This field would be used for only public traffic as
of now. In case of guest traffic this
-                field would be ignored and could be left empty for guest traffic. By default
empty
-                string would be assumed which translates to untagged VLAN for that specific
traffic
-                type.</para></entry>
+            <entry><para>This field would be used for only public traffic as
of now. In case of
+                guest traffic this field would be ignored and could be left empty for guest
traffic.
+                By default empty string would be assumed which translates to untagged VLAN
for that
+                specific traffic type.</para></entry>
           </row>
           <row>
             <entry><para>3</para></entry>
@@ -153,6 +178,7 @@
         </tbody>
       </tgroup>
     </informaltable>
+    
   </section>
   <section id="enable-dvswitch">
     <title>Enabling Virtual Distributed Switch in &PRODUCT;</title>
@@ -171,6 +197,10 @@
   <section id="config-dvswitch">
     <title>Configuring Distributed Virtual Switch in &PRODUCT;</title>
     <para>You can configure VDS by adding the necessary resources while a zone is created.</para>
+    <para>Alternatively, at the cluster level, you can create an additional cluster
with VDS enabled
+      in the existing zone. Use the Add Cluster option. For information as given in <xref
+        linkend="add-clusters-vsphere"/>.</para>
+    <para>In both these cases, you must specify the following parameters to configure
VDS:</para>
     <mediaobject>
       <imageobject>
         <imagedata fileref="./images/dvSwitch-config.png"/>
@@ -179,10 +209,6 @@
         <phrase>dvSwitchConfig.png: Configuring dvSwitch</phrase>
       </textobject>
     </mediaobject>
-    <para>Alternatively, you can create an additional cluster with VDS enabled in the
existing zone.
-      Use the Add Cluster option. For information as given in <xref linkend="add-clusters-vsphere"
-      />.</para>
-    <para>In both these cases, you must specify the following parameters to configure
VDS:</para>
     <informaltable frame="all">
       <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <colspec colname="c1"/>


Mime
View raw message