Merge pull request #183988 from cynthn/lin-quick

denrea · web-flow · commit e29a1f1edcde · 2022-01-19T10:00:05.000-08:00
Quickstarts
diff --git a/articles/virtual-machines/linux/media/quick-create-portal/instance-details.png b/articles/virtual-machines/linux/media/quick-create-portal/instance-details.png
diff --git a/articles/virtual-machines/linux/quick-create-portal.md b/articles/virtual-machines/linux/quick-create-portal.md
@@ -6,7 +6,7 @@ ms.service: virtual-machines
 ms.collection: linux
 ms.topic: quickstart
 ms.workload: infrastructure
-ms.date: 06/25/2020
+ms.date: 12/13/2021
 ms.author: cynthn
 ms.custom: mvc, mode-ui
 ---
@@ -21,20 +21,22 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
 
 ## Sign in to Azure
 
-Sign in to the [Azure portal](https://portal.azure.com) if you haven't already.
+Sign in to the [Azure portal](https://portal.azure.com).
 
 ## Create virtual machine
 
 1. Type **virtual machines** in the search.
 1. Under **Services**, select **Virtual machines**.
-1. In the **Virtual machines** page, select **Add**. The **Create a virtual machine** page opens.
+1. In the **Virtual machines** page, select **Create** and then **Virtual machine**.  The **Create a virtual machine** page opens.
+
 1. In the **Basics** tab, under **Project details**, make sure the correct subscription is selected and then choose to **Create new** resource group. Type *myResourceGroup* for the name.*. 
 
 	![Screenshot of the Project details section showing where you select the Azure subscription and the resource group for the virtual machine](./media/quick-create-portal/project-details.png)
 
-1. Under **Instance details**, type *myVM* for the **Virtual machine name**, choose *East US* for your **Region**, and choose *Ubuntu 18.04 LTS* for your **Image**. Leave the other defaults.
+1. Under **Instance details**, type *myVM* for the **Virtual machine name**, and choose *Ubuntu 18.04 LTS - Gen2* for your **Image**. Leave the other defaults. The default size and pricing is only shown as an example. Size availability and pricing is dependent on your region and subscription.
+
+    :::image type="content" source="media/quick-create-portal/instance-details.png" alt-text="Screenshot of the Instance details section where you provide a name for the virtual machine and select its region, image, and size.":::
 
-	![Screenshot of the Instance details section where you provide a name for the virtual machine and select its region, image and size](./media/quick-create-portal/instance-details.png)
 
 1. Under **Administrator account**, select **SSH public key**.
 
diff --git a/articles/virtual-machines/linux/quick-create-powershell.md b/articles/virtual-machines/linux/quick-create-powershell.md
@@ -6,9 +6,9 @@ ms.service: virtual-machines
 ms.collection: linux
 ms.topic: quickstart
 ms.workload: infrastructure
-ms.date: 07/31/2020
+ms.date: 01/14/2022
 ms.author: cynthn
-ms.custom: mvc, devx-track-azurepowershell, mode-api
+ms.custom: mvc, devx-track-azurepowershell,
 ---
 
 # Quickstart: Create a Linux virtual machine in Azure with PowerShell
@@ -25,20 +25,6 @@ The Azure Cloud Shell is a free interactive shell that you can use to run the st
 
 To open the Cloud Shell, just select **Try it** from the upper right corner of a code block. Select **Copy** to copy the blocks of code, paste it into the Cloud Shell, and press enter to run it.
 
-## Create SSH key pair
-
-Use [ssh-keygen](https://www.ssh.com/ssh/keygen/) to create an SSH key pair. If you already have an SSH key pair, you can skip this step.
-
-
-```azurepowershell-interactive
-ssh-keygen -t rsa -b 4096
-```
-
-You will be prompted to provide a filename for the key pair or you can hit **Enter** to use the default location of `/home/<username>/.ssh/id_rsa`. You will also be able to create a password for the keys, if you like.
-
-For more detailed information on how to create SSH key pairs, see [How to use SSH keys with Windows](ssh-from-windows.md).
-
-If you create your SSH key pair using the Cloud Shell, it will be stored in a [storage account that is automatically created by Cloud Shell](../../cloud-shell/persisting-shell-storage.md). Don't delete the storage account, or the files share in it, until after you have retrieved your keys or you will lose access to the VM. 
 
 ## Create a resource group
 
@@ -48,146 +34,60 @@ Create an Azure resource group with [New-AzResourceGroup](/powershell/module/az.
 New-AzResourceGroup -Name "myResourceGroup" -Location "EastUS"
 ```
 
-## Create virtual network resources
 
-Create a virtual network, subnet, and a public IP address. These resources are used to provide network connectivity to the VM and connect it to the internet:
+## Create a virtual machine
 
-```azurepowershell-interactive
-# Create a subnet configuration
-$subnetConfig = New-AzVirtualNetworkSubnetConfig `
-  -Name "mySubnet" `
-  -AddressPrefix 192.168.1.0/24
-
-# Create a virtual network
-$vnet = New-AzVirtualNetwork `
-  -ResourceGroupName "myResourceGroup" `
-  -Location "EastUS" `
-  -Name "myVNET" `
-  -AddressPrefix 192.168.0.0/16 `
-  -Subnet $subnetConfig
-
-# Create a public IP address and specify a DNS name
-$pip = New-AzPublicIpAddress `
-  -ResourceGroupName "myResourceGroup" `
-  -Location "EastUS" `
-  -AllocationMethod Static `
-  -IdleTimeoutInMinutes 4 `
-  -Name "mypublicdns$(Get-Random)"
-```
+We will be automatically generating an SSH key pair to use for connecting to the VM. The public key that is created using `-GenerateSshKey` will be stored in Azure as a resource, using the name you provide as `SshKeyName`. The SSH key resource can be reused for creating additional VMs. Both the public and private keys will also downloaded for you. When you create your SSH key pair using the Cloud Shell, the keys are stored in a [storage account that is automatically created by Cloud Shell](../../cloud-shell/persisting-shell-storage.md). Don't delete the storage account, or the file share in it, until after you have retrieved your keys or you will lose access to the VM.
+
+You will be prompted for a user name that will be used when you connect to the VM. You will also be asked for a password, which you can leave blank. Password login for the VM is disabled when using an SSH key.
 
-Create an Azure Network Security Group and traffic rule. The Network Security Group secures the VM with inbound and outbound rules. In the following example, an inbound rule is created for TCP port 22 that allows SSH connections. To allow incoming web traffic, an inbound rule for TCP port 80 is also created.
+In this example, you create a VM named *myVM*, in *East US*, using the *Standard_B2s* VM size.
 
 ```azurepowershell-interactive
-# Create an inbound network security group rule for port 22
-$nsgRuleSSH = New-AzNetworkSecurityRuleConfig `
-  -Name "myNetworkSecurityGroupRuleSSH"  `
-  -Protocol "Tcp" `
-  -Direction "Inbound" `
-  -Priority 1000 `
-  -SourceAddressPrefix * `
-  -SourcePortRange * `
-  -DestinationAddressPrefix * `
-  -DestinationPortRange 22 `
-  -Access "Allow"
-
-# Create an inbound network security group rule for port 80
-$nsgRuleWeb = New-AzNetworkSecurityRuleConfig `
-  -Name "myNetworkSecurityGroupRuleWWW"  `
-  -Protocol "Tcp" `
-  -Direction "Inbound" `
-  -Priority 1001 `
-  -SourceAddressPrefix * `
-  -SourcePortRange * `
-  -DestinationAddressPrefix * `
-  -DestinationPortRange 80 `
-  -Access "Allow"
-
-# Create a network security group
-$nsg = New-AzNetworkSecurityGroup `
-  -ResourceGroupName "myResourceGroup" `
-  -Location "EastUS" `
-  -Name "myNetworkSecurityGroup" `
-  -SecurityRules $nsgRuleSSH,$nsgRuleWeb
+New-AzVm `
+    -ResourceGroupName "myResourceGroup" `
+    -Name "myVM" `
+    -Location "East US" `
+    -Image UbuntuLTS `
+    -size Standard_B2s `
+    -PublicIpAddressName myPubIP `
+    -OpenPorts 80,22 `
+    -GenerateSshKey `
+    -SshKeyName mySSHKey
 ```
 
-Create a virtual network interface card (NIC) with [New-AzNetworkInterface](/powershell/module/az.network/new-aznetworkinterface). The virtual NIC connects the VM to a subnet, Network Security Group, and public IP address.
+The output will give you the location of the local copy of the SSH key. For example:
 
-```azurepowershell-interactive
-# Create a virtual network card and associate with public IP address and NSG
-$nic = New-AzNetworkInterface `
-  -Name "myNic" `
-  -ResourceGroupName "myResourceGroup" `
-  -Location "EastUS" `
-  -SubnetId $vnet.Subnets[0].Id `
-  -PublicIpAddressId $pip.Id `
-  -NetworkSecurityGroupId $nsg.Id
+```output
+Private key is saved to /home/user/.ssh/1234567891
+Public key is saved to /home/user/.ssh/1234567891.pub
 ```
 
-## Create a virtual machine
+Make a note of the path to your private key to use later.
 
-To create a VM in PowerShell, you create a configuration that has settings like the image to use, size, and authentication options. Then the configuration is used to build the VM.
+It will take a few minutes for your VM to be deployed. When the deployment is finished, move on to the next section.
 
-Define the SSH credentials, OS information, and VM size. In this example, the SSH key is stored in `~/.ssh/id_rsa.pub`. 
 
-```azurepowershell-interactive
-# Define a credential object
-$securePassword = ConvertTo-SecureString ' ' -AsPlainText -Force
-$cred = New-Object System.Management.Automation.PSCredential ("azureuser", $securePassword)
-
-# Create a virtual machine configuration
-$vmConfig = New-AzVMConfig `
-  -VMName "myVM" `
-  -VMSize "Standard_D1_v2" | `
-Set-AzVMOperatingSystem `
-  -Linux `
-  -ComputerName "myVM" `
-  -Credential $cred `
-  -DisablePasswordAuthentication | `
-Set-AzVMSourceImage `
-  -PublisherName "Canonical" `
-  -Offer "UbuntuServer" `
-  -Skus "18.04-LTS" `
-  -Version "latest" | `
-Add-AzVMNetworkInterface `
-  -Id $nic.Id
-
-# Configure the SSH key
-$sshPublicKey = cat ~/.ssh/id_rsa.pub
-Add-AzVMSshPublicKey `
-  -VM $vmconfig `
-  -KeyData $sshPublicKey `
-  -Path "/home/azureuser/.ssh/authorized_keys"
-```
+## Connect to the VM
 
-Now, combine the previous configuration definitions to create with [New-AzVM](/powershell/module/az.compute/new-azvm):
+You need to change the permission on the SSH key using `chmod`. Replace *~/.ssh/1234567891* in the following example with the private key name and path from the earlier output.
 
 ```azurepowershell-interactive
-New-AzVM `
-  -ResourceGroupName "myResourceGroup" `
-  -Location eastus -VM $vmConfig
+chmod 600 ~/.ssh/1234567891
 ```
 
-It will take a few minutes for your VM to be deployed. When the deployment is finished, move on to the next section.
-
-[!INCLUDE [ephemeral-ip-note.md](../../../includes/ephemeral-ip-note.md)]
-
-## Connect to the VM
-
 Create an SSH connection with the VM using the public IP address. To see the public IP address of the VM, use the [Get-AzPublicIpAddress](/powershell/module/az.network/get-azpublicipaddress) cmdlet:
 
 ```azurepowershell-interactive
 Get-AzPublicIpAddress -ResourceGroupName "myResourceGroup" | Select "IpAddress"
 ```
 
-Using the same shell you used to create your SSH key pair, paste the the following command into the shell to create an SSH session. Replace *10.111.12.123* with the IP address of your VM.
+Using the same shell you used to create your SSH key pair, paste the the following command into the shell to create an SSH session. Replace *~/.ssh/1234567891* in the following example with the private key name and path from the earlier output. Replace *10.111.12.123* with the IP address of your VM and *azureuser* with the name you provided when you created the VM.
 
 ```bash
-ssh azureuser@10.111.12.123
+ssh -i ~/.ssh/1234567891 azureuser@10.111.12.123
 ```
 
-When prompted, the login user name is *azureuser*. If a passphrase is used with your SSH keys, you need to enter that when prompted.
-
-
 ## Install NGINX
 
 To see your VM in action, install the NGINX web server. From your SSH session, update your package sources and then install the latest NGINX package.
diff --git a/articles/virtual-machines/windows/quick-create-portal.md b/articles/virtual-machines/windows/quick-create-portal.md
@@ -27,7 +27,8 @@ Sign in to the Azure portal at https://portal.azure.com.
 
 1. Type **virtual machines** in the search.
 1. Under **Services**, select **Virtual machines**.
-1. In the **Virtual machines** page, select **Create** then **Virtual machine**. 
+1. In the **Virtual machines** page, select **Create** and then **Virtual machine**. The **Create a virtual machine** page opens.
+
 1. In the **Basics** tab, under **Project details**, make sure the correct subscription is selected and then choose to **Create new** resource group. Type *myResourceGroup* for the name. 
 
     ![Screenshot of the Project details section showing where you select the Azure subscription and the resource group for the virtual machine](./media/quick-create-portal/project-details.png)
