VMware new additions for deploy-as-is

Author: nvazquez

source/adminguide/templates.rst

@@ -159,7 +159,7 @@ as the prototype for other VMs.
    -  **Name and Display Text**. These will be shown in the UI, so
       choose something descriptive.
 
-   -  **OS Type**. This helps CloudStack and the hypervisor perform
+   -  **OS Type**. (Except for VMware). This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following.
 
@@ -177,6 +177,12 @@ as the prototype for other VMs.
             5.4 to support a CentOS 6.2 image will in general not work. 
             In those cases you should choose Other.
 
+         .. note::
+            Since version 4.15, VMware templates do not allow users or administrators
+            selecting an OS Type when registering a template. The OS Type is
+            obtained from the template after it is registered.
+
+
    -  **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
       the Community Templates list. See `“Private and
@@ -192,6 +198,12 @@ The new template will be visible in the Templates section when the
 template creation process has been completed. The template is then
 available when creating a new VM.
 
+.. note::
+   Since version 4.15, CloudStack obtains information from the VMware templates
+   automatically at registration time. If a template contains different deployment
+   options (or configurations) as in the case of virtual appliances, then CloudStack
+   display the information required by the template, allowing users or administrators
+   to configure their instances.  
 
 Creating a Template from a Snapshot
 -----------------------------------
@@ -237,7 +249,7 @@ To upload a template:
       available, or All Zones to make it available throughout
       CloudStack.
 
-   -  **OS Type**: This helps CloudStack and the hypervisor perform
+   -  **OS Type**: (Except fo VMware). This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following:
 
@@ -251,6 +263,11 @@ To upload a template:
             support a CentOS 6.2 image will in general not work. In 
             those cases you should choose Other.
 
+         .. note::
+            Since version 4.15, VMware templates do not allow users or administrators
+            selecting an OS Type when registering a template. The OS Type is
+            obtained from the template after it is registered.
+
    -  **Hypervisor**: The supported hypervisors are listed. Select the
       desired one.
 

source/adminguide/virtual_machines.rst

@@ -141,7 +141,8 @@ To create a VM from a template:
    service offering.
 
    .. note:: 
-      VMware only: If the selected template OVF contains static properties, the wizard will display these properties. Static 
+      VMware only: If the selected template contains OVF properties, different deployment options or configurations,
+      multiple NICs or end-user license agreements, then the wizard will display these properties. Static 
       properties do not have the concept of required and optional fields . Therefore CloudStack is not able
       to enforce the population of 'important fields'.