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
commit d4605f943b1f07058472291dd0a13f4c5eda9b44 Merge: 41f314b a618875 Author: Rohit Yadav <[email protected]> AuthorDate: Mon May 24 16:17:37 2021 +0530 Merge remote-tracking branch 'origin/4.15' Signed-off-by: Rohit Yadav <[email protected]> source/_static/images/B&R-BackupSchedule.png | Bin 0 -> 11270 bytes source/_static/images/B&R-BackupScheduleEntry.png | Bin 0 -> 29420 bytes source/_static/images/B&R-assignOffering.png | Bin 0 -> 10759 bytes source/_static/images/B&R-backup_offering.png | Bin 0 -> 25843 bytes .../_static/images/B&R-backup_offering_policy.png | Bin 0 -> 24437 bytes source/_static/images/B&R-createBackup.png | Bin 0 -> 9625 bytes source/_static/images/CloudStack-ldap-screen1.png | Bin 23243 -> 20815 bytes source/_static/images/L2-networks-gui.png | Bin 0 -> 20854 bytes source/_static/images/SnapshotButton.png | Bin 967 -> 1205 bytes source/_static/images/VMSnapshotButton.png | Bin 967 -> 1210 bytes source/_static/images/add-cluster.png | Bin 35697 -> 25804 bytes source/_static/images/add-guest-network.png | Bin 20547 -> 40484 bytes source/_static/images/add-ip-range.png | Bin 16572 -> 18976 bytes source/_static/images/add-new-gateway-vpc.png | Bin 21912 -> 30140 bytes source/_static/images/add-tier.png | Bin 19054 -> 22947 bytes source/_static/images/add-vm-vpc.png | Bin 8596 -> 19440 bytes source/_static/images/add-vpc.png | Bin 20392 -> 39667 bytes source/_static/images/add-vpn-customer-gateway.png | Bin 29851 -> 46648 bytes source/_static/images/addAccount-icon.png | Bin 605 -> 1254 bytes source/_static/images/addvm-tier-sharednw.png | Bin 111465 -> 36253 bytes source/_static/images/attach-disk-icon.png | Bin 1092 -> 1204 bytes source/_static/images/change-affinity-button.png | Bin 7300 -> 1051 bytes source/_static/images/change-password.png | Bin 891 -> 1163 bytes source/_static/images/change-service-icon.png | Bin 769 -> 1091 bytes source/_static/images/cks-add-version-form.png | Bin 19847 -> 47936 bytes source/_static/images/cks-cluster-access-tab.png | Bin 160308 -> 101218 bytes source/_static/images/cks-cluster-details-tab.png | Bin 34508 -> 65292 bytes source/_static/images/cks-clusters.png | Bin 152379 -> 78141 bytes source/_static/images/cks-create-cluster-form.png | Bin 38496 -> 44622 bytes source/_static/images/cks-delete-action.png | Bin 4689 -> 1106 bytes source/_static/images/cks-kube-config-action.png | Bin 4960 -> 34933 bytes source/_static/images/cks-scale-action.png | Bin 4407 -> 1051 bytes source/_static/images/cks-scale-cluster-form.png | Bin 15165 -> 21478 bytes source/_static/images/cks-start-action.png | Bin 3074 -> 953 bytes source/_static/images/cks-stop-action.png | Bin 5948 -> 1130 bytes source/_static/images/cks-upgrade-action.png | Bin 6807 -> 1186 bytes source/_static/images/cks-upgrade-cluster-form.png | Bin 16208 -> 17492 bytes source/_static/images/cks-versions.png | Bin 157368 -> 84285 bytes source/_static/images/cloudian-s3_ss_cache.png | Bin 69503 -> 18957 bytes source/_static/images/cloudian-ss_globalopt.png | Bin 71861 -> 33632 bytes .../_static/images/compute-service-offerings.png | Bin 75482 -> 89866 bytes source/_static/images/compute_offering_dialog.png | Bin 113614 -> 89715 bytes source/_static/images/console-icon.png | Bin 953 -> 1012 bytes source/_static/images/create-vpn-connection.png | Bin 7703 -> 10447 bytes source/_static/images/dedicate-resource-button.png | Bin 7144 -> 1670 bytes source/_static/images/del-tier.png | Bin 815 -> 1106 bytes source/_static/images/delete-button.png | Bin 735 -> 1106 bytes source/_static/images/destroy-instance.png | Bin 815 -> 1106 bytes source/_static/images/detach-disk-icon.png | Bin 953 -> 1190 bytes source/_static/images/diagnostics-form.png | Bin 14520 -> 14627 bytes source/_static/images/ec2-s3-configuration.png | Bin 38778 -> 20733 bytes source/_static/images/edit-icon.png | Bin 940 -> 1121 bytes source/_static/images/egress-firewall-rule.png | Bin 10413 -> 24341 bytes source/_static/images/enable-disable.png | Bin 982 -> 9826 bytes source/_static/images/http-access.png | Bin 10214 -> 12664 bytes source/_static/images/iso-icon.png | Bin 991 -> 1204 bytes source/_static/images/kvm-direct-download.png | Bin 6710 -> 13260 bytes source/_static/images/kvm-rolling-maintenance.png | Bin 3529 -> 1410 bytes .../_static/images/{ => legacy}/1000-foot-view.png | Bin .../images/{ => legacy}/B&R-BackupSchedule.jpg | Bin .../{ => legacy}/B&R-BackupScheduleEntry.jpg | Bin .../images/{ => legacy}/B&R-assignOffering.jpg | Bin .../images/{ => legacy}/B&R-backup_offering.jpg | Bin .../{ => legacy}/B&R-backup_offering_policy.jpg | Bin .../images/{ => legacy}/B&R-createBackup.jpg | Bin .../{ => legacy}/CloudStack-ldap-screen1.png | Bin .../images/{ => legacy}/DevCloud-hostonly.png | Bin source/_static/images/{ => legacy}/DevCloud.png | Bin .../images/{ => legacy}/L2-networks-gui.JPG | Bin .../_static/images/{ => legacy}/SnapshotButton.png | Bin .../images/{ => legacy}/VMSnapshotButton.png | Bin .../{ => legacy}/about-cloudstack-customized.JPG | Bin source/_static/images/{ => legacy}/add-cifs.png | Bin source/_static/images/{ => legacy}/add-cluster.png | Bin source/_static/images/{ => legacy}/add-gateway.png | Bin .../images/{ => legacy}/add-guest-network.png | Bin .../add-instance-keyboards-customized.JPG | Bin .../_static/images/{ => legacy}/add-ip-range.png | Bin .../{ => legacy}/add-ldap-configuration-ad.png | Bin .../add-ldap-configuration-openldap.png | Bin .../images/{ => legacy}/add-new-gateway-vpc.png | Bin source/_static/images/{ => legacy}/add-tier.png | Bin .../_static/images/{ => legacy}/add-vlan-icon.png | Bin source/_static/images/{ => legacy}/add-vm-vpc.png | Bin source/_static/images/{ => legacy}/add-vpc.png | Bin .../{ => legacy}/add-vpn-customer-gateway.png | Bin .../images/{ => legacy}/addAccount-icon.png | Bin .../images/{ => legacy}/addvm-tier-sharednw.png | Bin .../images/{ => legacy}/attach-disk-icon.png | Bin .../images/{ => legacy}/change-affinity-button.png | Bin .../images/{ => legacy}/change-password.png | Bin .../images/{ => legacy}/change-service-icon.png | Bin .../_static/images/{ => legacy}/cifs-primary.png | Bin source/_static/images/{ => legacy}/cifs-ss.png | Bin .../images/{ => legacy}/cks-add-version-form.png | Bin .../images/{ => legacy}/cks-cluster-access-tab.png | Bin .../{ => legacy}/cks-cluster-details-tab.png | Bin .../_static/images/{ => legacy}/cks-clusters.png | Bin .../{ => legacy}/cks-create-cluster-form.png | Bin .../images/{ => legacy}/cks-delete-action.png | Bin .../images/{ => legacy}/cks-kube-config-action.png | Bin .../images/{ => legacy}/cks-scale-action.png | Bin .../images/{ => legacy}/cks-scale-cluster-form.png | Bin .../images/{ => legacy}/cks-start-action.png | Bin .../images/{ => legacy}/cks-stop-action.png | Bin .../images/{ => legacy}/cks-upgrade-action.png | Bin .../{ => legacy}/cks-upgrade-cluster-form.png | Bin .../_static/images/{ => legacy}/cks-versions.png | Bin .../images/{ => legacy}/cloudian-s3_ss_cache.png | Bin .../images/{ => legacy}/cloudian-ss_globalopt.png | Bin .../{ => legacy}/compute-service-offerings.png | Bin .../compute_offering_dialog-multidomain.png | Bin .../{ => legacy}/compute_offering_dialog.png | Bin .../_static/images/{ => legacy}/console-icon.png | Bin .../images/{ => legacy}/create-vpn-connection.png | Bin .../{ => legacy}/dedicate-resource-button.png | Bin source/_static/images/{ => legacy}/del-tier.png | Bin .../_static/images/{ => legacy}/delete-button.png | Bin .../images/{ => legacy}/destroy-instance.png | Bin .../images/{ => legacy}/detach-disk-icon.png | Bin .../images/{ => legacy}/diagnostics-form.png | Bin .../images/{ => legacy}/dvswitch-config.png | Bin .../images/{ => legacy}/ec2-s3-configuration.png | Bin source/_static/images/{ => legacy}/edit-icon.png | Bin .../images/{ => legacy}/edit-traffic-type.png | Bin .../images/{ => legacy}/egress-firewall-rule.png | Bin .../_static/images/{ => legacy}/enable-disable.png | Bin source/_static/images/{ => legacy}/http-access.png | Bin .../instance-metrics-customized-view.JPG | Bin source/_static/images/{ => legacy}/iso-icon.png | Bin .../images/{ => legacy}/kvm-direct-download.png | Bin .../{ => legacy}/kvm-rolling-maintenance.png | Bin source/_static/images/{ => legacy}/ldap-config.png | Bin .../images/{ => legacy}/mesos-integration-arch.jpg | 0 source/_static/images/{ => legacy}/metric-view.png | Bin .../images/{ => legacy}/migrate-instance.png | Bin source/_static/images/{ => legacy}/network-acl.png | Bin .../images/{ => legacy}/networking-egress-rule.png | Bin .../images/{ => legacy}/networking-in-a-pod.png | Bin .../images/{ => legacy}/networking-in-a-zone.png | Bin .../networking-infra-traffic-labels.png | Bin .../{ => legacy}/networking-ingress-rule.png | Bin .../networking-zone-traffic-labels.png | Bin .../images/{ => legacy}/nvp-add-controller.png | Bin .../images/{ => legacy}/nvp-enable-provider.png | Bin .../images/{ => legacy}/nvp-network-offering.png | Bin .../{ => legacy}/nvp-physical-network-stt.png | Bin .../images/{ => legacy}/ovs-network-offering.png | Bin .../ovs-physical-network-gre-enable.png | Bin .../{ => legacy}/ovs-physical-network-gre.png | Bin source/_static/images/{ => legacy}/plugin4.jpg | Bin .../_static/images/{ => legacy}/plugin_intro.jpg | Bin .../images/{ => legacy}/release-ip-icon.png | Bin source/_static/images/{ => legacy}/remove-nic.png | Bin source/_static/images/{ => legacy}/remove-tier.png | Bin source/_static/images/{ => legacy}/remove-vpc.png | Bin source/_static/images/{ => legacy}/remove-vpn.png | Bin .../images/{ => legacy}/replace-acl-icon.png | Bin .../images/{ => legacy}/replace-acl-list.png | Bin source/_static/images/{ => legacy}/reset-vpn.png | Bin .../images/{ => legacy}/resize-volume-icon.png | Bin .../_static/images/{ => legacy}/resize-volume.png | Bin source/_static/images/{ => legacy}/restart-vpc.png | Bin source/_static/images/{ => legacy}/revert-vm.png | Bin .../images/{ => legacy}/run-diagnostics-icon.png | Bin source/_static/images/{ => legacy}/s3-ss.png | Bin .../_static/images/{ => legacy}/search-button.png | Bin .../{ => legacy}/select-vm-staticnat-vpc.png | Bin .../images/{ => legacy}/set-default-nic.png | Bin .../images/{ => legacy}/stop-instance-icon.png | Bin .../_static/images/{ => legacy}/suspend-icon.png | Bin .../{ => legacy}/template-permissions-update-1.PNG | Bin .../legacy/template-permissions-update-1.png | Bin 0 -> 20188 bytes .../{ => legacy}/template-permissions-update-2.PNG | Bin .../{ => legacy}/template-permissions-update-3.PNG | Bin .../{ => legacy}/template-permissions-update-4.PNG | Bin .../{ => legacy}/template-permissions-update-5.PNG | Bin .../template-permissions-update-manually-1.PNG | Bin .../template-permissions-update-manually-2.PNG | Bin .../images/{ => legacy}/update-ssl-icon.png | Bin source/_static/images/{ => legacy}/update-ssl.png | Bin .../images/{ => legacy}/upload-iso-from-local.png | Bin .../images/{ => legacy}/view-console-button.png | Bin .../images/{ => legacy}/view-systemvm-details.png | Bin .../{ => legacy}/vm-settings-dropdown-list.PNG | Bin .../vm-settings-values-dropdown-KVM-list.PNG | Bin .../vm-settings-values-dropdown-KVM-list.png | Bin 0 -> 18276 bytes .../vm-settings-values-dropdown-list.PNG | Bin .../vm-settings-values1-dropdown-list.PNG | Bin .../volume-metrics-customized-view.JPG | Bin source/_static/images/{ => legacy}/vpc-setting.png | Bin source/_static/images/{ => legacy}/vpn-icon.png | Bin source/_static/images/{ => legacy}/vr-upgrade.png | Bin .../images/{ => legacy}/vxlan-physicalnetwork.png | Bin .../images/{ => legacy}/vxlan-trafficlabel.png | Bin .../images/{ => legacy}/vxlan-vniconfig.png | Bin source/_static/images/{ => legacy}/workloads.png | Bin source/_static/images/migrate-instance.png | Bin 837 -> 1034 bytes source/_static/images/networking-egress-rule.png | Bin 39649 -> 24202 bytes .../images/networking-infra-traffic-labels.png | Bin 92572 -> 29855 bytes source/_static/images/networking-ingress-rule.png | Bin 44719 -> 44432 bytes .../images/networking-zone-traffic-labels.png | Bin 247970 -> 60402 bytes source/_static/images/nuage_iso_net_off.png | Bin 300337 -> 0 bytes source/_static/images/nuage_kvm_traffic_label.jpg | Bin 82083 -> 0 bytes source/_static/images/nuage_sha_net_off.png | Bin 297457 -> 0 bytes source/_static/images/nuage_source_nat_net_off.png | Bin 135190 -> 0 bytes source/_static/images/nuage_underlay_api_usage.png | Bin 229780 -> 0 bytes .../_static/images/nuage_vmware_traffic_label.jpg | Bin 132936 -> 0 bytes source/_static/images/nuage_vpc_net_off.png | Bin 302542 -> 0 bytes source/_static/images/nuage_vpc_off.png | Bin 227849 -> 0 bytes source/_static/images/nuage_vsd_device_add.png | Bin 115589 -> 0 bytes .../images/nuage_vsp_isolation_method_setting.png | Bin 826955 -> 0 bytes source/_static/images/nuage_vsp_nsp_enable.png | Bin 287791 -> 0 bytes source/_static/images/nuage_vsp_nsp_status.png | Bin 512455 -> 0 bytes source/_static/images/nuage_vsp_vpc_off.png | Bin 221995 -> 0 bytes source/_static/images/nvp-add-controller.png | Bin 35928 -> 21555 bytes source/_static/images/nvp-enable-provider.png | Bin 32158 -> 54130 bytes source/_static/images/nvp-network-offering.png | Bin 104060 -> 89996 bytes source/_static/images/nvp-physical-network-stt.png | Bin 27317 -> 26095 bytes source/_static/images/ovs-network-offering.png | Bin 113750 -> 45749 bytes .../images/ovs-physical-network-gre-enable.png | Bin 41642 -> 32727 bytes source/_static/images/ovs-physical-network-gre.png | Bin 17354 -> 34878 bytes source/_static/images/plugin4.png | Bin 0 -> 6015 bytes source/_static/images/plugin_intro.png | Bin 0 -> 1496 bytes source/_static/images/release-ip-icon.png | Bin 815 -> 1106 bytes source/_static/images/remove-nic.png | Bin 735 -> 1106 bytes source/_static/images/remove-vpc.png | Bin 815 -> 1106 bytes source/_static/images/remove-vpn.png | Bin 735 -> 1106 bytes source/_static/images/replace-acl-icon.png | Bin 982 -> 1051 bytes source/_static/images/reset-vpn.png | Bin 860 -> 1213 bytes source/_static/images/resize-volume-icon.png | Bin 857 -> 1156 bytes source/_static/images/resize-volume.png | Bin 11995 -> 10420 bytes source/_static/images/restart-vpc.png | Bin 860 -> 1192 bytes source/_static/images/revert-vm.png | Bin 860 -> 1192 bytes source/_static/images/run-diagnostics-icon.png | Bin 803 -> 1226 bytes source/_static/images/search-button.png | Bin 1012 -> 482 bytes source/_static/images/select-vm-staticnat-vpc.png | Bin 17472 -> 19406 bytes source/_static/images/set-default-nic.png | Bin 1012 -> 1176 bytes source/_static/images/stop-instance-icon.png | Bin 955 -> 1206 bytes source/_static/images/suspend-icon.png | Bin 982 -> 1314 bytes .../images/template-permissions-update-1.png | Bin 0 -> 15105 bytes .../images/template-permissions-update-2.png | Bin 0 -> 16510 bytes .../images/template-permissions-update-3.png | Bin 0 -> 15284 bytes .../images/template-permissions-update-4.png | Bin 0 -> 16924 bytes .../images/template-permissions-update-5.png | Bin 0 -> 9156 bytes .../template-permissions-update-manually-1.png | Bin 0 -> 13663 bytes .../template-permissions-update-manually-2.png | Bin 0 -> 13983 bytes .../_static/images/template-upload-from-local.PNG | Bin 24034 -> 0 bytes .../_static/images/template-upload-from-local.png | Bin 0 -> 39246 bytes .../images/update-service-offering-button.jpg | Bin 13590 -> 0 bytes .../images/update-service-offering-button.png | Bin 0 -> 1089 bytes source/_static/images/update-ssl.png | Bin 30619 -> 41904 bytes source/_static/images/upload-iso-from-local.png | Bin 28621 -> 41764 bytes .../_static/images/vm-settings-dropdown-list.png | Bin 0 -> 32044 bytes .../vm-settings-values-dropdown-KVM-list.png | Bin 0 -> 18276 bytes .../images/vm-settings-values-dropdown-list.png | Bin 0 -> 27937 bytes .../images/vm-settings-values1-dropdown-list.png | Bin 0 -> 18203 bytes source/_static/images/volume-from-snap.PNG | Bin 8404 -> 0 bytes source/_static/images/volume-from-snap.png | Bin 0 -> 11832 bytes source/_static/images/vpn-icon.png | Bin 1012 -> 3732 bytes source/_static/images/vr-upgrade.png | Bin 940 -> 1156 bytes source/_static/images/vxlan-physicalnetwork.png | Bin 68376 -> 65744 bytes source/_static/images/vxlan-trafficlabel.png | Bin 61473 -> 51779 bytes source/_static/images/vxlan-vniconfig.png | Bin 18161 -> 34239 bytes source/adminguide/autoscale_without_netscaler.rst | 139 +++--- source/adminguide/backup_and_recovery.rst | 30 +- source/adminguide/networking.rst | 62 +-- .../networking/global_server_load_balancing.rst | 17 +- .../multiple_subnets_in_shared_network.rst | 8 +- source/adminguide/networking/remote_access_vpn.rst | 6 +- source/adminguide/networking/site_to_site_vpn.rst | 15 +- .../networking/virtual_private_cloud_config.rst | 29 +- source/adminguide/service_offerings.rst | 96 ++-- source/adminguide/storage.rst | 12 +- source/adminguide/templates.rst | 96 ++-- source/adminguide/troubleshooting.rst | 22 +- source/adminguide/virtual_machines.rst | 120 ++--- source/developersguide/plugins.rst | 56 +-- source/installguide/building_from_source.rst | 8 +- source/installguide/configuration.rst | 131 ++---- source/installguide/hypervisor/kvm.rst | 6 + source/installguide/hypervisor/vsphere.rst | 11 + source/plugins/index.rst | 1 - source/plugins/nuage-plugin.rst | 513 --------------------- source/releasenotes/compat.rst | 8 +- 285 files changed, 445 insertions(+), 941 deletions(-) diff --cc source/adminguide/templates.rst index fa35628,ab85f9c..3f3b35a --- a/source/adminguide/templates.rst +++ b/source/adminguide/templates.rst @@@ -171,12 -171,17 +171,12 @@@ as the prototype for other VMs PV (32-bit) or Other PV (64-bit). This choice is available only for XenServere: - .. note:: - Generally you should not choose an older version of the OS - than the version in the image. For example, choosing CentOS - 5.4 to support a CentOS 6.2 image will in general not work. + .. note:: + Generally you should not choose an older version of the OS + than the version in the image. For example, choosing CentOS + 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 @@@ -284,13 -290,14 +287,16 @@@ To upload a template more prominent for users to select. The template will appear in the Featured Templates list. Only an administrator can make a template Featured. - + 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. +.. note:: - 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. ++ 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>`_. @@@ -303,12 -310,17 +309,12 @@@ Uploading Templates and ISOs from a loc It's also possible to upload an already prepared template or an ISO from your local computer. The steps are similar as when Uploading a template/ISO from a remote HTTP server, except that you need to choose a local template/ISO file from your PC. - For this feature to work, your SSVMs must be supporting HTTPS (for more info please visit `“Using a SSL Certificate for the Console Proxy” + 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| + |template-upload-from-local.png| |upload-iso-from-local.png| diff --cc source/adminguide/virtual_machines.rst index a4aeaf6,3d69363..dadb011 --- a/source/adminguide/virtual_machines.rst +++ b/source/adminguide/virtual_machines.rst @@@ -36,10 -36,10 +36,10 @@@ names can be controlled by the user - Name – host name that the DHCP server assigns to the VM. Can be set by the user. Defaults to instance name - .. note:: - You can append the display name of a guest VM to its internal name. - For more information, see `“Appending a Name to the Guest VM’s + .. note:: + You can append the display name of a guest VM to its internal name. - For more information, see `“Appending a Display Name to the Guest VM’s - Internal Name” <#appending-a-display-name-to-the-guest-vms-internal-name>`_. ++ For more information, see `“Appending a Name to the Guest VM’s + Internal Name” <#appending-a-name-to-the-guest-vms-internal-name>`_. Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by the system. If the system detects that the VM is @@@ -755,23 -765,18 +755,23 @@@ Details/settings that are hidden for us - memoryOvercommitRatio - Message.ReservedCapacityFreed.Flag +Details/settings that are read-only for users by default: + +- dataDiskController +- rootDiskController + An example list of settings as well as their possible values are shown on the images below: - |vm-settings-dropdown-list.PNG| + |vm-settings-dropdown-list.png| (VMware hypervisor) - |vm-settings-values-dropdown-list.PNG| + |vm-settings-values-dropdown-list.png| (VMware disk controllers) - |vm-settings-values1-dropdown-list.PNG| + |vm-settings-values1-dropdown-list.png| (VMware NIC models) - |vm-settings-values-dropdown-KVM-list.PNG| + |vm-settings-values-dropdown-KVM-list.png| (KVM disk controllers) @@@ -908,11 -913,10 +908,11 @@@ snapshot To revert to the snapshot, click the Revert button. |revert-vm.png| - .. note:: - VM snapshots are deleted automatically when a VM is destroyed. You don't + .. note:: + 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 ============================== diff --cc source/installguide/configuration.rst index acaa21a,067c284..fe73f23 --- a/source/installguide/configuration.rst +++ b/source/installguide/configuration.rst @@@ -674,14 -674,12 +674,13 @@@ Advanced Zone Configuratio To configure the first primary storage server, enter the following, then click Next: - - **Name.** The name of the storage device. + - **Name.** (Obligatory) The name of the storage device. + + - **Protocol.** (Obligatory) For XenServer, choose either NFS, iSCSI, or + PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, RBD or custom (for PowerFlex). - For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS. The - remaining fields in the screen vary depending on what you choose - here. - - **Protocol.** For XenServer, choose either NFS, iSCSI, or - PreSetup. For KVM, choose NFS, SharedMountPoint, CLVM, and RBD. + For vSphere, choose either NFS, PreSetup (VMFS - iSCSI/FiberChannel, vSAN, vVols) or DatastoreCluster. + The remaining fields in the screen vary depending on what you choose here. .. cssclass:: table-striped table-bordered table-hover @@@ -1182,8 -1123,9 +1124,9 @@@ cluster - **Name.** The name of the storage device. - **Protocol.** For XenServer, choose either NFS, iSCSI, or - PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere + PreSetup. For KVM, choose NFS, SharedMountPoint or custom (for PowerFlex). For vSphere - choose either NFS, PreSetup (VMFS, vSAN, vVols) or datastorecluster. For Hyper-V, choose SMB. + choose either NFS, PreSetup (VMFS - iSCSI/FiberChannel, vSAN, vVols) or DatastoreCluster. For Hyper-V, + choose SMB. - **Server (for NFS, iSCSI, or PreSetup).** The IP address or DNS name of the storage device. @@@ -1258,13 -1200,9 +1201,13 @@@ Configuring a Storage Plug-i primary storage (although most of its features are available through the CloudStack UI). + +SolidFire Plug-in +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + .. note:: - The SolidFire storage plug-in for CloudStack is part of the standard - CloudStack install. There is no additional work required to add this + The SolidFire storage plug-in for CloudStack is part of the standard + CloudStack install. There is no additional work required to add this component. Adding primary storage that is based on the SolidFire plug-in enables
