diff --git a/source/adminguide/accounts.rst b/source/adminguide/accounts.rst index a83bcd105d..cd6edc5360 100644 --- a/source/adminguide/accounts.rst +++ b/source/adminguide/accounts.rst @@ -337,7 +337,7 @@ the user are used. #. CloudStack searches for it in LDAP by the configured ``ldap.username.attribute``. - #. If an LDAP user is found is found, CloudStack does a bind + #. If an LDAP user is found, CloudStack does a bind request with the returned principal for that LDAP user and the entered password. @@ -345,7 +345,7 @@ the user are used. authenticated user exists in the domain it is trying to log on to. - #. If the user exists in CloudStack, it is ensured to be enabled + #. If the user exists in CloudStack, it is ensured to be enabled. #. If it doesn't exist it is created in a new account with the username as names for both account and user. diff --git a/source/adminguide/virtual_machines.rst b/source/adminguide/virtual_machines.rst index 3d693634fa..8d191cd471 100644 --- a/source/adminguide/virtual_machines.rst +++ b/source/adminguide/virtual_machines.rst @@ -127,33 +127,35 @@ To create a VM from a template: #. Log in to the CloudStack UI as an administrator or user. -#. In the left navigation bar, click Instances. +#. In the left navigation bar, click Compute -> Instances. -#. Click Add Instance. +#. Click the Add Instance button. #. Select a zone. Admin users will have the option to select a pod, cluster or host. -#. Select a template, then follow the steps in the wizard. For more - information about how the templates came to be in this list, see - `*Working with Templates* `_. +#. Select a template or ISO. For more information about how the templates came + to be in this list, see `*Working with Templates* `_. #. Be sure that the hardware you have allows starting the selected service offering. +#. Select a disk offering. + +#. Select/Add a network. + + .. 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. See `“Support for Virtual Appliances” `_. -#. Click Submit and your VM will be created and started. +#. Click Launch Virtual Machine and your VM will be created and started. .. note:: For security reason, the internal name of the VM is visible only to the root admin. -To create a VM from an ISO: - .. note:: **XenServer** @@ -163,19 +165,6 @@ To create a VM from an ISO: functions such as mounting additional volumes and ISO images, live migration, and graceful shutdown. -#. Log in to the CloudStack UI as an administrator or user. - -#. In the left navigation bar, click Instances. - -#. Click Add Instance. - -#. Select a zone. Admin users will have the option to select a pod, cluster or host. - -#. Select ISO Boot, and follow the steps in the wizard. - -#. Click Submit and your VM will be created and started. - - Install Required Tools and Drivers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -217,7 +206,7 @@ To access a VM through the CloudStack UI: #. Log in to the CloudStack UI as a user or admin. -#. Click Instances, then click the name of a running VM. +#. Click Compute -> Instances, then click the name of a running VM. #. Click the View Console button |console-icon.png|. @@ -272,7 +261,7 @@ To delete a virtual machine: #. Log in to the CloudStack UI as a user or admin. -#. In the left navigation, click Instances. +#. In the left navigation, click Compute -> Instances. #. Choose the VM that you want to delete.