Sync release-hotfixes with main

Sync release-hotfixes with main

Author: sethmanheim

AKS-Arc/aks-create-clusters-portal.md

@@ -4,7 +4,7 @@ description: Create Kubernetes clusters using the Azure portal.
 author: sethmanheim
 ms.author: sethm
 ms.topic: how-to
-ms.date: 02/26/2025
+ms.date: 04/22/2025
 ms.reviewer: guanghu
 ms.lastreviewed: 01/30/2024
 ---

azure-local/TOC.yml

@@ -524,12 +524,12 @@ items:
       href: migrate/migrate-faq.yml
     - name: Troubleshoot
       href: migrate/migrate-troubleshoot.md
-  - name: Migrate using SCVMM (v22H2 only)
+  - name: Migrate using SCVMM
     items:
     - name: For Hyper-V VMs
-      href: /system-center/vmm/deploy-manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json#step-8-migrate-vms-from-windows-server-to-azure-stack-hci-cluster
+      href: /system-center/vmm/manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json#migrate-vms-from-windows-server-to-azure-local-instance
     - name: For VMware VMs
-      href: /system-center/vmm/deploy-manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json#step-9-migrate-vmware-workloads-to-azure-stack-hci-cluster-using-scvmm
+      href: /system-center/vmm/vm-convert-vmware?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json
   - name: Migrate manually (v22H2 only)
     items:
     - name: To same hardware
@@ -708,6 +708,12 @@ items:
       href: /windows-server/storage/storage-spaces/storage-spaces-states?context=/azure/azure-local/context/context
     - name: Collect diagnostic data
       href: manage/collect-diagnostic-data.md
+  - name: Migrate using SCVMM
+    items:
+    - name: For Hyper-V VMs
+      href: /system-center/vmm/deploy-manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json#step-8-migrate-vms-from-windows-server-to-azure-local-instance
+    - name: For VMware VMs
+      href: /system-center/vmm/deploy-manage-azure-stack-hci?toc=/azure/azure-local/toc.json&bc=/azure/azure-local/breadcrumb/toc.json#step-9-migrate-vmware-workloads-to-azure-local-instance-using-scvmm
   - name: Concepts
     items:
     - name: Storage and systems

azure-local/deploy/deploy-via-portal.md

@@ -15,9 +15,12 @@ ms.service: azure-local
 
 This article helps you deploy an Azure Local instance using the Azure portal.
 
+> [!IMPORTANT]
+> The Azure portal will block deployments of Azure Local for versions 2411.3 or earlier. To deploy these versions, use an Azure Resource Manager (ARM) template. For more information, see [Deploy Azure Local via Azure Resource Manager deployment template](./deployment-azure-resource-manager-template.md).
+
 ## Prerequisites
 
-* Completion of [Register your machines with Azure Arc and assign deployment permissions](./deployment-arc-register-server-permissions.md).
+- Completion of [Register your machines with Azure Arc and assign deployment permissions](./deployment-arc-register-server-permissions.md).
 <!-- Cristian to confirm * For three-node systems, the network adapters that carry the in-cluster storage traffic must be connected to a network switch. Deploying three-node systems with storage network adapters that are directly connected to each machine without a switch isn't supported in this preview.-->
 
 ## Start the wizard and fill out the basics

azure-local/deploy/deployment-azure-arc-gateway-configure-manually.md

@@ -3,7 +3,7 @@ title: Configure Arc proxy manually for Azure gateway on Azure Local, version 24
 description: Learn how to configure Arc proxy manually for Azure gateway on Azure Local, version 2408 and 2408.1 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 02/20/2025
+ms.date: 04/22/2025
 ms.author: alkohli
 ms.service: azure-local
 ---
@@ -43,7 +43,7 @@ To register new version 2408 or version 2411 machines in Azure Arc, you run the
 ```azurecli
 #Define the subscription where you want to register your server as Arc device. 
 
-$Subscription = "yoursubscription>" 
+$Subscription = "yoursubscription" 
 
 #Define the resource group where you want to register your server as Arc device.
 
@@ -152,4 +152,4 @@ To view gateway router logs on Windows, run the `azcmagent logs` command in Powe
 
 This feature is available only in Azure Local 2411.1 or later.
 
-::: moniker-end
+::: moniker-end

azure-local/deploy/deployment-azure-arc-gateway-configure-via-script.md

@@ -3,7 +3,7 @@ title: Configure Arc proxy via registration script for Azure gateway on Azure Lo
 description: Learn how to Configure Arc proxy via registration script for Azure gateway on Azure Local, version 2408 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 02/20/2025
+ms.date: 04/22/2025
 ms.author: alkohli
 ms.service: azure-local
 ---
@@ -134,4 +134,4 @@ To view gateway router logs on Windows, run the `azcmagent logs` command in Powe
 
 This feature is available only in Azure Local 2411.1 or later.
 
-::: moniker-end
+::: moniker-end

azure-local/deploy/deployment-azure-arc-gateway-use-without-proxy.md

@@ -3,7 +3,7 @@ title: Use Azure gateway without a proxy on Azure Local, version 2408 (preview)
 description: Learn how to use Azure gateway without a proxy, on Azure Local instance running version 2408 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 02/20/2025
+ms.date: 04/22/2025
 ms.author: alkohli
 ms.service: azure-local
 ---
@@ -128,4 +128,4 @@ To view gateway router logs on Windows, run the `azcmagent logs` command in Powe
 
 This feature is available only in Azure Local 2411.1 or later.
 
-::: moniker-end
+::: moniker-end

azure-local/deploy/deployment-azure-resource-manager-template.md

@@ -3,7 +3,7 @@ title: Azure Resource Manager template deployment for Azure Local, version 23H2
 description: Learn how to prepare and then deploy Azure Local instance, version 23H2 using the Azure Resource Manager template.
 author: alkohli
 ms.topic: how-to
-ms.date: 04/29/2025
+ms.date: 05/01/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -24,6 +24,7 @@ This article details how to use an Azure Resource Manager template in the Azure
 - Completion of [Register your machines with Azure Arc and assign deployment permissions](./deployment-arc-register-server-permissions.md). Make sure that:
   - All machines are running the same version of OS.
   - All the machines have the same network adapter configuration.
+- For Azure Local 2411.3 and earlier versions, make sure to select the **create-cluster-2411.3** template for deployment.
 
 ## Step 1: Prepare Azure resources
 
@@ -75,6 +76,9 @@ With all the prerequisite and preparation steps complete, you're ready to deploy
 
     :::image type="content" source="./media/deployment-azure-resource-manager-template/deploy-arm-template-3a.png" alt-text="Screenshot showing template selected." lightbox="./media/deployment-azure-resource-manager-template/deploy-arm-template-3a.png":::
 
+    > [!NOTE]
+    > For Azure Local 2411.3 and earlier versions, make sure to select the **create-cluster-2411.3** template for deployment.
+
 1. On the **Basics** tab, you see the **Custom deployment** page. You can select the various parameters through the dropdown list or select **Edit parameters**.
 
     :::image type="content" source="./media/deployment-azure-resource-manager-template/deploy-arm-template-4a.png" alt-text="Screenshot showing Custom deployment page on the Basics tab." lightbox="./media/deployment-azure-resource-manager-template/deploy-arm-template-4a.png":::
@@ -165,7 +169,7 @@ This section contains known issues and workarounds for ARM template deployment.
 
 :::image type="content" source="./media/deployment-azure-resource-manager-template/error-tenantid-applicationid-principalid-not-allowed-to-update-1.png" alt-text="Screenshot showing the tenant ID, application ID, principal ID, and scope can't be updated message in the Errors blade." lightbox="./media/deployment-azure-resource-manager-template/error-tenantid-applicationid-principalid-not-allowed-to-update-1.png":::
 
-**Workaround**: To identify the zombie role assignments, go to **Access control (IAM) > Role assignments > Type : Unknown** tab. These assignments are listed as **Identity not found. Unable to find identity.* Delete such role assignments and then retry ARM template deployment.
+**Workaround**: To identify the zombie role assignments, go to **Access control (IAM) > Role assignments > Type : Unknown** tab. These assignments are listed as *Identity not found. Unable to find identity.* Delete such role assignments and then retry ARM template deployment.
 
 :::image type="content" source="./media/deployment-azure-resource-manager-template/error-identity-not-found-1.png" alt-text="Screenshot showing the identity not found message in the Errors blade." lightbox="./media/deployment-azure-resource-manager-template/error-identity-not-found-1.png":::
 
@@ -177,5 +181,5 @@ This section contains known issues and workarounds for ARM template deployment.
 
 ## Next steps
 
-- [About Arc VM management](../manage/azure-arc-vm-management-overview.md)
-- [Deploy Azure Arc VMs on Azure Local](../manage/create-arc-virtual-machines.md)
+- [About Azure Local VM management](../manage/azure-arc-vm-management-overview.md)
+- [Create Azure Local VMs enabled by Azure Arc](../manage/create-arc-virtual-machines.md)

azure-local/deploy/deployment-local-identity-with-key-vault.md

@@ -3,7 +3,7 @@ title: Deploy Azure Local, version 23H2 using local identity with Azure Key Vaul
 description: Learn how to use local identity with Azure Key Vault for Azure Local, version 23H2 deployment (preview).
 author: alkohli
 ms.topic: how-to
-ms.date: 03/11/2025
+ms.date: 04/22/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -19,7 +19,7 @@ This article describes how to use local identity with Azure Key Vault for Azure
 
 ## Overview
 
-Previously known as AD-less deployment, the method of using local identity with Key Vault allows Azure Local to securely manage and store secrets, such as BitLocker keys, node passwords, and other sensitive information, without relying on AD. By integrating with Key Vault and using certificate-based authentication, you can enhance your security posture and ensure the continuity of operations.
+Previously known as AD-less deployment, the method of using local identity with Key Vault allows Azure Local to securely manage and store secrets, such as BitLocker keys, node passwords, and other sensitive information, without relying on Active Directory (AD). By integrating with Key Vault and using certificate-based authentication, you can enhance your security posture and ensure the continuity of operations.
 
 ## Benefits
 
@@ -107,9 +107,9 @@ The general deployment steps are the same as those outlined in [Deploy an Azure
 
 ### Networking tab
 
-1. Provide the DNS server details configured in the [Configure DNS for Azure Local](#configure-dns-server-for-azure-local) section.
+- Provide the DNS server details configured in the [Configure DNS for Azure Local](#configure-dns-server-for-azure-local) section.
 
-      :::image type="content" source="media/deployment-local-identity-with-key-vault/provide-dns-server.png" alt-text="Screenshot of the Networking tab showing the DNS Server field." lightbox="media/deployment-local-identity-with-key-vault/provide-dns-server.png":::
+    :::image type="content" source="media/deployment-local-identity-with-key-vault/provide-dns-server.png" alt-text="Screenshot of the Networking tab showing the DNS Server field." lightbox="media/deployment-local-identity-with-key-vault/provide-dns-server.png":::
 
 ### Management tab
 
@@ -224,12 +224,12 @@ To address and resolve the issue of the failed extension and restore normal back
 ## Next steps
 
 - If you didn't create workload volumes during deployment, create workload volumes and storage paths for each volume. For details, see [Create volumes on Azure Local and Windows Server clusters](/windows-server/storage/storage-spaces/create-volumes) and [Create storage path for Azure Local](../manage/create-storage-path.md).
-- [Get support for Azure Local deployment issues](../manage/get-support-for-deployment-issues.md).
+- [Get support for Azure Local deployment issues](../manage/get-support-for-deployment-issues.md)
 
 ::: moniker-end
 
 ::: moniker range="<=azloc-2411"
 
 This feature is available only in Azure Local 2411 or later.
 
-::: moniker-end
+::: moniker-end

azure-local/deploy/deployment-prerequisites.md

@@ -3,7 +3,7 @@ title: Prerequisites to deploy Azure Local, version 23H2
 description: Learn about the prerequisites to deploy Azure Local, version 23H2.
 author: alkohli
 ms.topic: conceptual
-ms.date: 02/20/2025
+ms.date: 04/22/2025
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.service: azure-local
@@ -40,7 +40,7 @@ Use the following checklist to gather the required information ahead of the actu
 |Storage VLAN ID|Two unique VLAN IDs to be used for the storage networks, from your IT network administrator.<br> We recommend using the default VLANS from Network ATC for storage subnets. If you plan to have two storage subnets, Network ATC will use VLANS from 712 and 711 subnets. <br> For more information, see the **Specify network settings** page in [Deploy via Azure portal](./deploy-via-portal.md#specify-network-settings).|
 |DNS server|A DNS server that is used in your environment. The DNS server used must resolve the Active Directory Domain. <br> For more information, see the **Specify network settings** page in [Deploy via Azure portal](./deploy-via-portal.md#specify-network-settings).|
 |Local administrator credentials|Username and password for the local administrator for all the machines in your system. The credentials are identical for all the machines in your system.<br>Make sure that the local administrator password follows Azure password length and complexity requirements. Use a password that is at least 12 characters long and contains a lowercase character, an uppercase character, a numeral, and a special character.<br> For more information, see the **Specify management settings** page in [Deploy via Azure portal](./deploy-via-portal.md#specify-management-settings).|
-|Custom location|(Optional) A name for the custom location created for your system. This name is used for Azure Arc VM management. <br> For more information, see the **Specify management settings** page in [Deploy via Azure portal](./deploy-via-portal.md#specify-management-settings).|
+|Custom location|(Optional) A name for the custom location created for your system. This name is used for Azure Local VM management. <br> For more information, see the **Specify management settings** page in [Deploy via Azure portal](./deploy-via-portal.md#specify-management-settings).|
 |Azure subscription ID|ID for the Azure subscription used to register the system. Make sure that you are a user access administrator and a contributor on this subscription. This will allow you to manage access to Azure resources, specifically to Arc-enable each machine of an Azure Local instance. For more information, see [Assign Azure permissions for deployment](./deployment-arc-register-server-permissions.md#assign-required-permissions-for-deployment)|
 |Azure Storage account|For two-node systems, a witness is required. For a cloud witness, an [Azure Storage account](/azure/storage/common/storage-account-create) is needed. In this release, you cannot use the same storage account for multiple systems. For more information, see **Specify management settings** in [Deploy via Azure portal](./deploy-via-portal.md#specify-management-settings). <br> For naming conventions, see [Azure Storage account names](/azure/storage/common/storage-account-overview#storage-account-name).|
 |Azure Key Vault|A key vault is required to securely store secrets for this system, such as cryptographic keys, local admin credentials, and BitLocker recovery keys. For requirements, see **Azure Key Vault** in [Azure requirements](../concepts/system-requirements-23h2.md#azure-requirements). For creating a key vault during deployment, see **Basics** in [Deploy via Azure portal](./deploy-via-portal.md#start-the-wizard-and-fill-out-the-basics). <br> For naming conventions, see [Azure Key Vault names](/azure/key-vault/general/about-keys-secrets-certificates#object-identifiers).|

azure-local/deploy/download-23h2-software.md

@@ -58,7 +58,7 @@ Follow these steps to download the software:
 
     2. Select your desired version. Only the recommended version is eligible for deployment using Azure portal. To deploy a previous version, use an [Azure Resource Manager template](deployment-azure-resource-manager-template.md).
 
-    3. Select **I agree with Azure Local license terms and private notice** and then select **Download**.
+    3. Select **I agree with Azure Local license terms and privacy notice** and then select **Download**.
 
     :::image type="content" source="media/download-23h2-software/download-azure-stack-hci-step-2.png" alt-text="Screenshot of the Download Azure Stack HCI OS version 23H2 page showing step 2." lightbox="media/download-23h2-software/download-azure-stack-hci-step-2.png":::