CLOUDSTACK-772 review comments on DVS fixed (cherry picked from commit 6da0eb4b8bbaa7348b779674654ec4ce9c09c441)
Signed-off-by: animesh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca0f6245 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca0f6245 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca0f6245 Branch: refs/heads/4.2 Commit: ca0f62455a1002caa90ce4abae47ff9eee071d1f Parents: 5566cd7 Author: radhikap <[email protected]> Authored: Tue Aug 27 14:23:30 2013 +0530 Committer: animesh <[email protected]> Committed: Tue Aug 27 13:30:41 2013 -0700 ---------------------------------------------------------------------- docs/en-US/vmware-cluster-config-dvswitch.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca0f6245/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 173055f..311673a 100644 --- a/docs/en-US/vmware-cluster-config-dvswitch.xml +++ b/docs/en-US/vmware-cluster-config-dvswitch.xml @@ -78,8 +78,6 @@ <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> -<<<<<<< HEAD -======= <para>The possible values for traffic labels are:</para> <itemizedlist> <listitem><para>empty string</para></listitem> @@ -155,7 +153,6 @@ </tbody> </tgroup> </informaltable> ->>>>>>> 6fc98a8... CLOUDSTACK-772 review comments on DVS fixed </section> <section id="enable-dvswitch"> <title>Enabling Virtual Distributed Switch in &PRODUCT;</title> @@ -166,8 +163,8 @@ &PRODUCT; uses VDS for virtual network infrastructure if the value of vmware.use.dvswitch parameter is true and the value of vmware.use.nexus.dvswitch parameter is false. Another global parameter that defines VDS configuration is vmware.ports.per.dvportgroup. This is the - default number of ports per VMware dvPortGroup in a VMware environment. This number directly - associated with the number of guest network you can create.</para> + default number of ports per VMware dvPortGroup in a VMware environment. Default value is 256. + This number directly associated with the number of guest network you can create.</para> <para>&PRODUCT; supports orchestration of virtual networks in a deployment with a mix of Virtual Distributed Switch, Standard Virtual Switch and Nexus 1000v Virtual Switch. </para> </section> @@ -257,5 +254,4 @@ </tgroup> </informaltable> </section> - </section>
