Updated Branches: refs/heads/4.0 4b3b53d1f -> c8c619a28
Removing references to the Nexus 1KV from the documentation, due to delaying CLOUDSTACK-301 to a later release. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c8c619a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c8c619a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c8c619a2 Branch: refs/heads/4.0 Commit: c8c619a2871ef8f05dff9a067f2aa9dc8fcc1477 Parents: 91cc2c0 Author: Chip Childers <[email protected]> Authored: Tue Oct 9 15:50:37 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Tue Oct 9 16:01:31 2012 -0400 ---------------------------------------------------------------------- docs/en-US/add-clusters-vsphere.xml | 11 ----------- docs/en-US/added-API-commands.xml | 16 ---------------- docs/en-US/advanced-zone-configuration.xml | 4 ---- docs/en-US/basic-zone-configuration.xml | 1 - 4 files changed, 0 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8c619a2/docs/en-US/add-clusters-vsphere.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-clusters-vsphere.xml b/docs/en-US/add-clusters-vsphere.xml index d9e78d2..6b2dff2 100644 --- a/docs/en-US/add-clusters-vsphere.xml +++ b/docs/en-US/add-clusters-vsphere.xml @@ -91,19 +91,8 @@ <listitem> <para>vCenter Datacenter. Enter the vCenter datacenter that the cluster is in. For example, "cloud.dc.VM".</para> - <para>If you have enabled Nexus dvSwitch in the environment, the following parameters for - dvSwitch configuration are displayed:</para> </listitem> <listitem> - <para>Nexus dvSwitch IP Address: The IP address of the Nexus VSM appliance.</para> - </listitem> - <listitem> - <para>Nexus dvSwitch Username: The username required to access the Nexus VSM - applicance.</para> - </listitem> - <listitem> - <para>Nexus dvSwitch Password: The password associated with the username specified - above.</para> <mediaobject> <imageobject> <imagedata fileref="./images/add-cluster.png"/> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8c619a2/docs/en-US/added-API-commands.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/added-API-commands.xml b/docs/en-US/added-API-commands.xml index 237c524..4303e40 100644 --- a/docs/en-US/added-API-commands.xml +++ b/docs/en-US/added-API-commands.xml @@ -149,22 +149,6 @@ <para>listVpnConnections (Lists site to site vpn connection gateways)</para> </listitem> </itemizedlist> - <para>Added in 3.0.3:</para> - <itemizedlist> - <listitem> - <para>enableCiscoNexusVSM (Enables Nexus 1000v dvSwitch in &PRODUCT;.)</para> - </listitem> - <listitem> - <para>disableCiscoNexusVSM (Disables Nexus 1000v dvSwitch in &PRODUCT;.)</para> - </listitem> - <listitem> - <para>deleteCiscoNexusVSM (Deletes Nexus 1000v dvSwitch in &PRODUCT;.)</para> - </listitem> - <listitem> - <para>listCiscoNexusVSMs (Lists the control VLAN ID, packet VLAN ID, and data VLAN ID, as well - as the IP address of the Nexus 1000v dvSwitch.)</para> - </listitem> - </itemizedlist> <para>Added in 3.0.2:</para> <itemizedlist> <listitem> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8c619a2/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 84649db..302265a 100644 --- a/docs/en-US/advanced-zone-configuration.xml +++ b/docs/en-US/advanced-zone-configuration.xml @@ -84,10 +84,6 @@ <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.</para> </listitem> <listitem> <para>Click Next.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c8c619a2/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 18afa84..00980c5 100644 --- a/docs/en-US/basic-zone-configuration.xml +++ b/docs/en-US/basic-zone-configuration.xml @@ -68,7 +68,6 @@ </listitem> <listitem><para>(Introduced in version 3.0.1) 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> - <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.</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>
