This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git
The following commit(s) were added to refs/heads/master by this push:
new 350e047 Optional deploy-as-is (#209)
350e047 is described below
commit 350e0476faa86efa440f8fd379025d2f417e5a05
Author: Nicolas Vazquez <[email protected]>
AuthorDate: Fri Apr 30 01:18:09 2021 -0300
Optional deploy-as-is (#209)
* Optional deploy-as-is
* Fix typo
---
source/adminguide/templates.rst | 33 +++++++---------------
source/adminguide/virtual_machines.rst | 2 ++
.../virtual_machines/virtual_appliances.rst | 19 +++++++++++--
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/source/adminguide/templates.rst b/source/adminguide/templates.rst
index 615f520..fa35628 100644
--- a/source/adminguide/templates.rst
+++ b/source/adminguide/templates.rst
@@ -177,11 +177,6 @@ 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
@@ -198,13 +193,6 @@ 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
-----------------------------------
@@ -249,7 +237,12 @@ To upload a template:
available, or All Zones to make it available throughout
CloudStack.
- - **OS Type**: (Except for VMware). This helps CloudStack and the
hypervisor perform
+ - **Read VM settings from OVA**. (VMware only) If selected, the registered
template will allow users to deploy VMs as clones of the template, including
all their properties, configurations, end-user license agreements, disks, os
type, etc. This option allows users to register virtual appliances. See
`Support for Virtual Appliances
<virtual_machines.html#about-virtual-appliances>`_.
+
+ .. note::
+ When this option is selected the following fields are hidden: Root
disk controller, Keyboard type and OS Type.
+
+ - **OS Type**: This helps CloudStack and the hypervisor perform
certain operations and make assumptions that improve the
performance of the guest. Select one of the following:
@@ -264,8 +257,8 @@ To upload a template:
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
+ Since version 4.15.1, VMware templates do not allow users or
administrators
+ selecting an OS Type when registering a template if the option
'Read VM settings from OVA' is selected. In this case, the OS Type is
obtained from the template after it is registered.
- **Hypervisor**: The supported hypervisors are listed. Select the
@@ -295,10 +288,9 @@ To upload a template:
Note that uploading multi-disk templates is also supported.
.. note::
- 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.
+ VMware only: If the template is registered with the option 'Read VM
settings from OVA' then the VM deployment wizard will display all the available
OVF properties, different deployment options or configurations, multiple NICs
or end-user license agreements.
- See `“Support for Virtual Appliances”
<virtual_machines.html#support-for-virtual-appliances>`_.
+ See `Support for Virtual Appliances
<virtual_machines.html#about-virtual-appliances>`_.
@@ -314,11 +306,6 @@ The steps are similar as when Uploading a template/ISO
from a remote HTTP server
For this feature to work, your SSVMs must be supporting HTTPS (for more info
please visit `“Using a SSL Certificate for the Console Proxy”
<systemvm.html#using-a-ssl-certificate-for-the-console-proxy>`_).
-.. note::
- Since version 4.15, VMware templates do not allow users or administrators
- selecting an OS Type when uploading a template. The OS Type is
- obtained from the template after it is uploaded.
-
Example GUI dialog of uploading Template/ISO from local (browser) is given
below:
|template-upload-from-local.PNG|
diff --git a/source/adminguide/virtual_machines.rst
b/source/adminguide/virtual_machines.rst
index afaf006..a4aeaf6 100644
--- a/source/adminguide/virtual_machines.rst
+++ b/source/adminguide/virtual_machines.rst
@@ -912,11 +912,13 @@ snapshot:
VM snapshots are deleted automatically when a VM is destroyed. You don't
have to manually delete the snapshots in this case.
+
Support for Virtual Appliances
==============================
.. include:: virtual_machines/virtual_appliances.rst
+
Unmanaging Virtual Machines
===========================
diff --git a/source/adminguide/virtual_machines/virtual_appliances.rst
b/source/adminguide/virtual_machines/virtual_appliances.rst
index e14d759..5d9ad26 100644
--- a/source/adminguide/virtual_machines/virtual_appliances.rst
+++ b/source/adminguide/virtual_machines/virtual_appliances.rst
@@ -1,3 +1,18 @@
+.. 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.
+
About Virtual Appliances
------------------------
@@ -8,9 +23,7 @@ An OVA file contain disc images, as well as the configuration
data of the virtua
Virtual Appliances are supported only on VMware.
.. note::
- Since version 4.15, all the new templates registered are treated as
virtual appliance templates.
-
- To keep the existing functionality, all the templates registered before
version 4.15 are not affected by this changes.
+ Since version 4.15.1, administrators and users can register virtual
appliance templates by selecting the option 'Read VM Settings from OVA' on the
template registration.
Deployment options (configurations)
-----------------------------------
