Merge pull request #228721 from mimckitt/Flex-Updates

Minor updates for Flexible Orchestration Mode

Author: Court72

articles/virtual-machine-scale-sets/TOC.yml

@@ -274,11 +274,6 @@
     maintainContext: true
   - name: Use data disks with scale sets
     href: virtual-machine-scale-sets-attached-disks.md
-  - name: Server-side disk Encryption
-    href: ../virtual-machines/disk-encryption.md
-    maintainContext: true
-  - name: Azure Disk Encryption
-    href: disk-encryption-overview.md
   - name: Encrypt disks in scale sets
     items:
     - name: Use PowerShell
@@ -291,6 +286,11 @@
       href: disk-encryption-extension-sequencing.md
     - name: Key vault for Azure Disk Encryption
       href: disk-encryption-key-vault.md
+    - name: Server-side disk Encryption
+      href: ../virtual-machines/disk-encryption.md
+      maintainContext: true
+    - name: Azure Disk Encryption
+      href: disk-encryption-overview.md
 - name: Networking
   items: 
   - name: Networking Overview

articles/virtual-machine-scale-sets/disk-encryption-cli.md

@@ -34,6 +34,7 @@ Now create a Virtual Machine Scale Set with [az vmss create](/cli/azure/vmss). T
 az vmss create \
   --resource-group myResourceGroup \
   --name myScaleSet \
+  --orchestration-mode Flexible \
   --image UbuntuLTS \
   --upgrade-policy-mode automatic \
   --admin-username azureuser \

articles/virtual-machine-scale-sets/disk-encryption-key-vault.md

@@ -29,18 +29,6 @@ You may also, if you wish, generate or import a key encryption key (KEK).
 
 The steps in this article can be completed with the [Azure CLI](/cli/azure/), the [Azure PowerShell Az module](/powershell/azure/), or the [Azure portal](https://portal.azure.com).
 
-### Connect to your Azure account
-
-Before using the Azure CLI or Azure PowerShell, you must first connect to your Azure subscription. You do so by [Signing in with Azure CLI](/cli/azure/authenticate-azure-cli), [Signing in with Azure PowerShell](/powershell/azure/authenticate-azureps), or supplying your credentials to the Azure portal when prompted.
-
-```azurecli-interactive
-az login
-```
-
-```azurepowershell-interactive
-Connect-AzAccount
-```
-
 [!INCLUDE [disk-encryption-key-vault](../../includes/disk-encryption-key-vault.md)]
 
 ## Next steps

articles/virtual-machine-scale-sets/disk-encryption-powershell.md

@@ -61,6 +61,7 @@ $vmssName="myScaleSet"
 New-AzVmss `
     -ResourceGroupName $rgName `
     -VMScaleSetName $vmssName `
+    -OrchestrationMode "flexible" `
     -Location $location `
     -VirtualNetworkName "myVnet" `
     -SubnetName "mySubnet" `