Sync release-hotfixes with main

Sync release-hotfixes with main

Author: sethmanheim

azure-stack/hci/toc.yml

@@ -215,21 +215,21 @@ items:
   items:
   - name: About Azure Stack HCI upgrades
     href: upgrade/about-upgrades-23h2.md
-  - name: Upgrade to version 23H2 OS
+  - name: 1 - Upgrade to version 23H2 OS
     items: 
-    - name: Via PowerShell
+    - name: 1A - Via PowerShell
       href: upgrade/upgrade-22h2-to-23h2-powershell.md
-    - name: Via Windows Admin Center
+    - name: 1B - Via Windows Admin Center
       href: upgrade/upgrade-22h2-to-23h2-windows-admin-center.md
-    - name: Via other methods
+    - name: 1C - Via other methods
       href: upgrade/upgrade-22h2-to-23h2-other-methods.md
-  - name: Perform post-OS upgrade tasks
+  - name: 2 - Perform post-OS upgrade tasks
     href: upgrade/post-upgrade-steps.md
-  - name: Install, enable Network ATC
+  - name: 3 - Install, enable Network ATC
     href: upgrade/install-enable-network-atc.md
-  - name: Validate solution upgrade readiness
+  - name: 4 - Validate solution upgrade readiness
     href: upgrade/validate-solution-upgrade-readiness.md
-  - name: Apply solution upgrade
+  - name: 5 - Apply solution upgrade
     href: upgrade/install-solution-upgrade.md
   - name: Troubleshoot upgrades
     href: upgrade/troubleshoot-upgrade-to-azure-stack-hci-23h2.md

azure-stack/hci/upgrade/about-upgrades-23h2.md

@@ -21,10 +21,10 @@ Throughout this article, we refer to Azure Stack HCI, version 23H2 as the *new*
 
 Azure Stack HCI, version 23H2 is the latest version of the Azure Stack HCI solution. This version integrates the Azure Arc infrastructure that provisions and manages the workloads such as Arc VMs, Azure Kubernetes Services, and Azure Virtual Desktop. For more information, see [What's new in Azure Stack HCI, version 23H2](../whats-new.md#features-and-improvements-in-2311).
 
-With version 23H2, Azure Stack HCI evolved from a cloud connected operating system (OS) to an Arc enabled solution. The OS forms the base layer of this solution, with the Arc and the Orchestrator (also known as the Lifecycle Manager) components layered on top. These components are packaged together into a solution that follows an [Infrastructure as code (IaC)](/devops/deliver/what-is-infrastructure-as-code) model.
+With version 23H2, Azure Stack HCI evolved from a cloud-connected operating system (OS) to an Arc-enabled solution. The OS forms the base layer of this solution, with the Arc and the Orchestrator (also known as the Lifecycle Manager) components layered on top. These components are packaged together into a solution that follows an [Infrastructure as code (IaC)](/devops/deliver/what-is-infrastructure-as-code) model.
 
-- This IaC model takes a set of input parameters that are specific to each customer and the environment.
-- The lifecycle manager then orchestrates the desired state across all the layers to meet the desired state and the version.
+- This IaC model takes a set of input parameters that are specific to each customer and environment.
+- The lifecycle manager then orchestrates the desired state across all the layers to meet the desired state and version.
 
 The following diagram illustrates the components of an Azure Stack HCI, version 23H2 system:
 
@@ -34,15 +34,15 @@ The following diagram illustrates the components of an Azure Stack HCI, version
 
 An upgrade is a whole new version of software that represents a significant change or major improvement. An update, on the other hand, is a process of applying a set of changes to the software to improve its performance, security, or stability.
 
-The Azure Stack HCI, version 23H2, is a whole new version of the solution with a multitude of new capabilities. To move from Azure Stack HCI, version 22H2 to version 23H2, you need to upgrade your existing cluster. On the other hand, to ensure that you have the most recent features and security improvements for your current version of Azure Stack HCI, you would need to update your existing cluster.
+Azure Stack HCI, version 23H2, is a whole new version of the solution with a multitude of new capabilities. To move from Azure Stack HCI, version 22H2 to version 23H2, you need to upgrade your existing cluster. On the other hand, to ensure that you have the most recent features and security improvements for your current version of Azure Stack HCI, you would need to update your existing cluster.
 
 ## High-level steps for Azure Stack HCI upgrade
 
 To upgrade your Azure Stack HCI from an old version, follow these high-level steps:
 
 1. Upgrade the *old* OS to the *new* OS using one of the following methods:
-    - [Via the PowerShell (recommended)](./upgrade-22h2-to-23h2-powershell.md).
-    - [Via the Windows Admin Center](./upgrade-22h2-to-23h2-windows-admin-center.md).
+    - [Via PowerShell (recommended)](./upgrade-22h2-to-23h2-powershell.md).
+    - [Via Windows Admin Center](./upgrade-22h2-to-23h2-windows-admin-center.md).
     - [Via other manual methods](./upgrade-22h2-to-23h2-other-methods.md).
 
 1. Perform post-OS upgrade tasks.
@@ -55,9 +55,12 @@ The following diagram illustrates the Azure Stack HCI upgrade process:
 
 :::image type="content" source="./media/about-upgrades-23h2/update-os-to-23h2-and-apply-the-solution-update.png" alt-text="Diagram that illustrates the two steps to update the Azure Stack HCI OS and then apply the solution update." lightbox="./media/about-upgrades-23h2/update-os-to-23h2-and-apply-the-solution-update.png":::
 
+> [!IMPORTANT]
+> If you were running AKS workloads on your Azure Stack HCI cluster, you must remove Azure Kubernetes Service and all the settings from AKS enabled by Azure Arc before you apply the solution upgrade. Kubernetes versions are incompatible between Azure Stack HCI, version 22H2, and version 23H2. Additionally, Preview versions of Arc VMs can't be updated.
+
 ## Next steps
 
 Choose one of the following options to upgrade your Azure Stack HCI, version 22H2 to Azure Stack HCI, version 23H2:
 - [Use PowerShell](./upgrade-22h2-to-23h2-powershell.md).
 - [Use Windows Admin Center](./upgrade-22h2-to-23h2-windows-admin-center.md).
-- [Use other methods](./upgrade-22h2-to-23h2-other-methods.md).
+- [Use other methods](./upgrade-22h2-to-23h2-other-methods.md).

azure-stack/hci/upgrade/install-enable-network-atc.md

@@ -5,8 +5,7 @@ author: ronmiab
 ms.author: robess
 ms.topic: how-to
 ms.reviewer: alkohli
-ms.lastreviewed: 08/13/2024
-ms.date: 08/13/2024
+ms.date: 08/14/2024
 #Customer intent: As a Senior Content Developer, I want to provide customers with content and steps to help them successfully install and enable Network ATC on their existing Azure Stack HCI, version 22H2 cluster.
 ---
 
@@ -16,6 +15,9 @@ ms.date: 08/13/2024
 
 This article provides information on how to install and enable Network ATC on your existing Azure Stack HCI, version 22H2 cluster. Once Network ATC is enabled you can take advantage of several benefits and utilize this configuration across all new deployments.
 
+> [!IMPORTANT]
+> Network ATC must be installed and enabled on your existing Azure Stack HCI, version 22H2 cluster before you can upgrade to Azure Stack HCI, version 23H2. If Network ATC is already enabled on your existing cluster, you can skip this step.
+
 ## About Network ATC
 
 Network ATC stores information in the cluster database, which is then replicated to other nodes in the cluster. From the initial node, other nodes in the cluster see the change in the cluster database and create a new intent. Here, we set up the cluster to receive a new intent. Additionally, we control the rollout of the new intent by stopping or disabling the Network ATC service on nodes that have virtual machines (VM) on them.

azure-stack/hci/upgrade/install-solution-upgrade.md

@@ -3,7 +3,7 @@ title: Install solution upgrade on your Azure Stack HCI cluster
 description: Learn about how to install upgrade on your Azure Stack HCI cluster.
 author: alkohli
 ms.topic: how-to
-ms.date: 08/13/2024
+ms.date: 08/14/2024
 ms.author: alkohli
 ms.reviewer: alkohli
 ms.subservice: azure-stack-hci
@@ -24,55 +24,99 @@ Before you install the solution upgrade, make sure that you:
 
 - Validate the cluster using the Environment Checker as per the instructions  in [Assess solution upgrade readiness](./validate-solution-upgrade-readiness.md#run-the-validation).
 - Verify that latest `AzureEdgeLifecycleManager` extension on each cluster node is installed as per the instructions in [Check the Azure Arc extension](./validate-solution-upgrade-readiness.md#remediation-9-check-the-azure-arc-lifecycle-extension).
-- Have an Active Directory user credential that's a member of the local Administrator group. Work with your Active Directory administrator to obtain this credential.
+
+    :::image type="content" source="media/install-solution-upgrade/verify-lcmextension-installed.png" alt-text="Screenshot of Extensions page showing AzureEdgeLifeCycleManager extension install on Azure Stack HCI node." lightbox="./media/install-solution-upgrade/verify-lcmextension-installed.png":::
+
+- Have an Active Directory user credential that's a member of the local Administrator group. Work with your Active Directory administrator to obtain this credential. For more information, see [Prepare Active Directory for Azure Stack HCI, version 23H2 deployment](../deploy/deployment-prep-active-directory.md).  
 - Have IPv4 network range with six, contiguous IP addresses available for new Azure Arc services. Work with your network administrator to ensure that the IP addresses aren't in use and meet the outbound connectivity requirement.
 - Have Azure subscription permissions for [Azure Stack HCI Administrator and Reader](../manage/assign-vm-rbac-roles.md#about-builtin-rbac-roles).  
 
+    :::image type="content" source="media/install-solution-upgrade/verify-subscription-permissions-roles.png" alt-text="Screenshot of subscription with permissions assigned to required roles for upgrade." lightbox="./media/install-solution-upgrade/verify-subscription-permissions-roles.png":::
+
 ## Install the solution upgrade via Azure portal
 
+You install the solution upgrade via the Azure portal.
+
+1. Go to your Azure Stack HCI cluster resource in the portal.
+1. In the **Overview** page, you can see a banner indicating that a solution upgrade is available. Select the **Upgrade** link in the banner.
+
+   :::image type="content" source="./media/install-solution-upgrade/upgrade-banner.png" alt-text="Screenshot of Azure Stack HCI Overview page with upgrade available banner." lightbox="./media/install-solution-upgrade/upgrade-banner.png":::
+
 ### Basics tab
 
 On the **Basics** tab, specify the following information:
 
-1. Specify whether you want to create a new key vault to store the credentials, or if you want to select an existing key vault. Only vaults in the same resource group are shown.
+1. Select an existing key vault from vaults in the resource group. Sharing an existing key vault can have security implications. If you don't have a key vault, you can create a new one to store the credentials.
 
-   > [!NOTE]
-   > We recommend that you select a new key vault as sharing an existing key vauilt may have security implications.
+   1. Select **Create a new key vault**.
+   1. Provide a **Name** for the new key vault. The name should be 3 to 24 characters long and contain only letters, numbers, and hyphens. Two consecutive hyphens are not allowed.
+
+   :::image type="content" source="./media/install-solution-upgrade/create-new-key-vault.png" alt-text="Screenshot of Create key vault page." lightbox="./media/install-solution-upgrade/create-new-key-vault.png":::
 
-1. Specify the deployment account credential. This credential is from your Active Directory for a principal that is a member of the local Administrator group on each cluster node.
+1. Specify the deployment account credential. This credential is from your Active Directory for a principal that is a member of the local Administrator group on each cluster node. For more information on how to create this deployment account, see [Prepare Active Directory for Azure Stack HCI, version 23H2 deployment](../deploy/deployment-prep-active-directory.md).
 
    > [!NOTE]
    > The user can't be Administrator and can't use format `domain\username`.
 
-1. Specify the custom location name used for Azure Arc services.
+1. Accept default name or specify the custom location name used for Azure Arc services.
 
-1. Specify network IP address information. A total of six IP addresses is required, defined by an IP address range. IP addresses in the range must:
+1. Specify network IP address information. A total of six, contiguous IP addresses is required, defined by an IP address range. IP addresses in the range must:
 
    - Not be in use.
    - Meet outbound connectivity requirements.
    - Communicate to the host IP addresses.
 
    :::image type="content" source="./media/install-solution-upgrade/upgrade-22h2-to-23h2-basics-tab.png" alt-text="Screenshot of Upgrade Azure Stack HCI basics tab." lightbox="./media/install-solution-upgrade/upgrade-22h2-to-23h2-basics-tab.png":::
 
+1. Select **Next: Validation**.
+
 ### Validation tab
 
 On the **Validation** tab, the operation automatically creates Azure resources like the cluster and the service principal, and also configures permissions and the audit login.
 
-1. Select **Start validation** to begin the operation. To learn more about validation, see [Validate solution upgrade readiness of your Azure Stack HCI cluster](./validate-solution-upgrade-readiness.md).
+1. Select **Start validation** to begin the operation. This operation involves running the Environment Checker to check external connectivity and storage requirements and that the environment is ready for solution upgrade. To learn more about validation, see [Validate solution upgrade readiness of your Azure Stack HCI cluster](./validate-solution-upgrade-readiness.md).
 
    :::image type="content" source="./media/install-solution-upgrade/upgrade-22h2-to-23h2-validation-tab.png" alt-text="Screenshot of Upgrade Azure Stack HCI validation tab." lightbox="./media/install-solution-upgrade/upgrade-22h2-to-23h2-validation-tab.png":::
 
+1. After the validation is complete, select **Next: Review + Create**.
+
 ### Review + Create tab
 
-Review the summary for the solution upgrade and then select **Review + Create**.
+1. On the **Review + Create** tab, review the summary for the solution upgrade.
 
-:::image type="content" source="./media/install-solution-upgrade/upgrade-22h2-to-23h2-review-and-create-tab.png" alt-text="Screenshot of Upgrade Azure Stack HCI review and create tab." lightbox="./media/install-solution-upgrade/upgrade-22h2-to-23h2-review-and-create-tab.png":::
+    :::image type="content" source="./media/install-solution-upgrade/upgrade-22h2-to-23h2-review-and-create-tab.png" alt-text="Screenshot of Upgrade Azure Stack HCI review and create tab." lightbox="./media/install-solution-upgrade/upgrade-22h2-to-23h2-review-and-create-tab.png":::
+
+1. Select **Review + Create** to start the upgrade process. You see a notification that the deployment is in progress.
 
 ## Monitor upgrade progress
 
-To monitor upgrade progress, select **Settings** > **Deployments**.
+1. Once the upgrade starts, you are automatically taken to **Settings > Deployment**. Refresh the screen periodically and monitor the upgrade progress.
+
+    :::image type="content" source="./media/install-solution-upgrade/upgrade-progress-1.png" alt-text="Screenshot of Upgrade Azure Stack HCI upgrade progress." lightbox="./media/install-solution-upgrade/upgrade-progress-1.png":::
+
+1. Wait for the upgrade to complete. The solution upgrade process can take a few hours depending upon the number of nodes in the cluster.
 
-:::image type="content" source="./media/install-solution-upgrade/upgrade-22h2-to-23h2-upgrade-progress.png" alt-text="Screenshot of Upgrade Azure Stack HCI upgrade progress." lightbox="./media/install-solution-upgrade/upgrade-22h2-to-23h2-upgrade-progress.png":::
+    :::image type="content" source="./media/install-solution-upgrade/upgrade-progress-2.png" alt-text="Screenshot of Upgrade Azure Stack HCI showing a completed upgrade." lightbox="./media/install-solution-upgrade/upgrade-progress-2.png":::
 
 > [!NOTE]
 > If the upgrade fails, restart the upgrade operation to try again.
+
+## Verify a successful upgrade
+
+Follow these steps to verify that the upgrade was successful:
+
+1. In the Azure portal, go to the resource group where you deployed the Azure Stack HCI system.
+1. On the **Overview > Resources** page, you should see the following resources:
+
+    
+    | Resource type | Number of resources   |
+    |---------|---------|
+    | Machine - Azure Arc     | 1 per server         |
+    | Azure Stack HCI         | 1       |
+    | Arc Resource Bridge     | 1, *-arcbridge* suffix by default       |
+    | Custom location         | 1, *-cl* suffix by default       |
+    | Key Vault               | 1       |
+
+    Here is a screenshot of the resources in the resource group:
+
+    :::image type="content" source="./media/install-solution-upgrade/verify-upgrade-portal.png" alt-text="Screenshot of Upgrade Azure Stack HCI resource health." lightbox="./media/install-solution-upgrade/verify-upgrade-portal.png":::