Merge pull request #3353 from MicrosoftDocs/main638640901846047416sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

.openpublishing.redirection.json

@@ -1489,6 +1489,11 @@
       "source_path": "azure-stack/hci/manage/processor-compatibility-mode.md",
       "redirect_url": "/windows-server/virtualization/hyper-v/manage/dynamic-processor-compatibility-mode?pivots=azure-stack-hci",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "azure-stack/hci/deploy/deployment-azure-arc-gateway-new-cluster.md",
+      "redirect_url": "/azure-stack/hci/deploy/deployment-azure-arc-gateway-overview",
+      "redirect_document_id": false
     }
   ]
 }

azure-stack/hci/deploy/deployment-azure-arc-gateway-configure-manually.md

@@ -3,14 +3,14 @@ title: Configure Arc proxy manually for Azure gateway, version 2408 (preview)
 description: Learn how to configure Arc proxy manually for Azure gateway, version 2408 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 09/26/2024
+ms.date: 10/09/2024
 ms.author: alkohli
 ms.subservice: azure-stack-hci
 ---
 
 # Configure Arc proxy manually for Azure gateway (preview)
 
-Applies to: Azure Stack HCI, versions 2408.1, 2408, and 23H2
+Applies to: Azure Stack HCI, version 23H2, releases 2408 and 2408.1
 
 After creating the Arc gateway resource in your Azure subscription, you can enable the new Arc gateway preview features. This article details how to manually configure the Arc proxy before Arc registration.
 
@@ -130,7 +130,7 @@ Once the deployment validation starts, you can connect to the first Azure Stack
 
 You can find the Arc gateway log at: *c:\programdata\AzureConnectedMAchineAgent\Log\arcproxy.log*.
 
-:::image type="content" source="./media/deployment-connect-nodes-to-arc-gateway/arc-gateway-log.png" alt-text="Screenshot that shows the the Arc gateway log using manual method." lightbox="./media/deployment-connect-nodes-to-arc-gateway/arc-gateway-log.png":::
+:::image type="content" source="./media/deployment-connect-nodes-to-arc-gateway/arc-gateway-log.png" alt-text="Screenshot that shows the Arc gateway log using manual method." lightbox="./media/deployment-connect-nodes-to-arc-gateway/arc-gateway-log.png":::
 
 To check the Arc agent configuration and verify that it is using the Arc gateway, run the following command: `c:\program files\AzureConnectedMachineAgent>.\azcmagent show`
 

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

@@ -3,14 +3,14 @@ title: Configure Arc proxy via registration script for Azure gateway, version 24
 description: Learn how to Configure Arc proxy via registration script for Azure gateway, version 2408 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 09/26/2024
+ms.date: 10/07/2024
 ms.author: alkohli
 ms.subservice: azure-stack-hci
 ---
 
 # Configure Arc proxy via registration script for Azure gateway (preview)
 
-Applies to: Azure Stack HCI, versions 2408.1, 2408, and 23H2
+Applies to: Azure Stack HCI, version 23H2, releases 2408 and 2408.1
 
 After creating the Arc gateway resource in your Azure subscription, you can enable the new Arc gateway preview features. This article details how to configure the Arc proxy before Arc registration using a registration script for the Arc gateway.
 

azure-stack/hci/deploy/deployment-azure-arc-gateway-new-cluster.md

@@ -3,14 +3,14 @@ title: Overview of Azure Arc gateway for Azure Stack HCI, version 23H2 (preview)
 description: Learn what is Azure Arc gateway for Azure Stack HCI, version 23H2 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 09/27/2024
+ms.date: 10/09/2024
 ms.author: alkohli
 ms.subservice: azure-stack-hci
 ---
 
 # About Azure Arc gateway for Azure Stack HCI, version 23H2 (preview)
 
-Applies to: Azure Stack HCI, versions 2408.1, 2408, and 23H2
+Applies to: Azure Stack HCI, version 23H2, releases 2408 and 2408.1
 
 This article provides an overview of the Azure Arc gateway for Azure Stack HCI, version 23H2. The Arc gateway can be enabled on new deployments of Azure Stack HCI running software version 2408 or later. This article also describes how to create and delete the Arc gateway resource in Azure.
 
@@ -58,7 +58,7 @@ When Arc gateway is used, the *http* and *https* traffic flow changes as follows
 
 Traffic flows are illustrated in the following diagram:
 
-:::image type="content" source="./media/deployment-azure-arc-gateway-overview/arc-gateway-component-diagram-2408.png" alt-text="Diagram of Azure Arc gateway version 2408 components." lightbox="./media/deployment-azure-arc-gateway-overview/arc-gateway-component-diagram-2408.png":::
+:::image type="content" source="./media/deployment-azure-arc-gateway-overview/arc-gateway-component-diagram.png" alt-text="Diagram of Azure Arc gateway architecture for version 2408." lightbox="./media/deployment-azure-arc-gateway-overview/arc-gateway-component-diagram.png":::
 
 <!-- ## Arc-enabled server endpoints redirected via the Arc gateway in limited Public Preview
 
@@ -94,34 +94,34 @@ As part of the Azure Stack HCI version 2408 preview update, the endpoints from t
 
 | Endpoint # | Required endpoint | Component  |
 | -- | -- | -- |
-| 1 | `http://go.microsoft.com:443` | Env Chkr |
-| 2 | `http://www.powershellgallery.com:443` | Env Chkr |
-| 3 | `http://psg-prod-eastus.azureedge.net:443` | Env Chkr |
-| 4 | `http://onegetcdn.azureedge.net:443` | Env Chkr |
-| 5 | `http://login.microsoftonline.com:443` | Env Chkr |
-| 6 | `http://aka.ms:443` | Env Chkr |
-| 7 | `http://azurestackreleases.download.prss.microsoft.com:443` | Env Chkr |
-| 8 | `http://download.microsoft.com:443` | Env Chkr |
-| 9 | `http://portal.azure.com:443` | Env Chkr |
-| 10 | `http://management.azure.com:443` | Env Chkr |
-| 11 | `http://www.office.com:443` | Env Chkr |
+| 1 | `http://go.microsoft.com:443` | Environment Checker |
+| 2 | `http://www.powershellgallery.com:443` | Environment Checker |
+| 3 | `http://psg-prod-eastus.azureedge.net:443` | Environment Checker |
+| 4 | `http://onegetcdn.azureedge.net:443` | Environment Checker |
+| 5 | `http://login.microsoftonline.com:443` | Environment Checker |
+| 6 | `http://aka.ms:443` | Environment Checker |
+| 7 | `http://azurestackreleases.download.prss.microsoft.com:443` | Environment Checker |
+| 8 | `http://download.microsoft.com:443` | Environment Checker |
+| 9 | `http://portal.azure.com:443` | Environment Checker |
+| 10 | `http://management.azure.com:443` | Environment Checker |
+| 11 | `http://www.office.com:443` | Environment Checker |
 | 12 | `http://gbl.his.arc.azure.com:443` | Arc agent |  
 | 13 | `http://<region>.his.arc.azure.com:443` | Arc agent |
 | 14 | `http://dc.services.visualstudio.com:443` | Arc agent |
 | 15 | `http://<yourarcgatewayId>.gw.arc.azure.com:443` | Arc gateway |
 | 16 | `http://<yourkeyvaultname>.vault.azure.net:443` | Azure Key Vault |
 | 17 | `http://<yourblobstorageforcloudwitnessname>.blob.core.windows.net:443` | Cloud Witness Storage Account |
-| 18 | `http://files.pythonhosted.org:443` | MOC/ARB/AKS |
-| 19 | `http://pypi.org:443` | MOC/ARB/AKS |
-| 20 | `http://raw.githubusercontent.com:443` | MOC/ARB/AKS |
-| 21 | `http://pythonhosted.org:443` | MOC/ARB/AKS |
-| 22 | `http://hciarcvmsstorage.z13.web.core.windows.net:443` | MOC/ARB/AKS |
-| 23 | `http://ocsp.digicert.com`  | CRL for Arc extensions |
-| 24 | `http://s.symcd.com` | CRL for Arc extensions |
-| 25 | `http://ts-ocsp.ws.symantec.com` | CRL for Arc extensions |
-| 26 | `http://ocsp.globalsign.com` | CRL for Arc extensions |
-| 27 | `http://ocsp2.globalsign.com` | CRL for Arc extensions |
-| 28 | `http://oneocsp.microsoft.com` | CRL for Arc extensions |
+| 18 | `http://files.pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 19 | `http://pypi.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 20 | `http://raw.githubusercontent.com:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 21 | `http://pythonhosted.org:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 22 | `http://hciarcvmsstorage.z13.web.core.windows.net:443` | Microsoft On-premises Cloud/ARB/AKS |
+| 23 | `http://ocsp.digicert.com`  | Certificate Revocation List for Arc extensions |
+| 24 | `http://s.symcd.com` | Certificate Revocation List for Arc extensions |
+| 25 | `http://ts-ocsp.ws.symantec.com` | Certificate Revocation List for Arc extensions |
+| 26 | `http://ocsp.globalsign.com` | Certificate Revocation List for Arc extensions |
+| 27 | `http://ocsp2.globalsign.com` | Certificate Revocation List for Arc extensions |
+| 28 | `http://oneocsp.microsoft.com` | Certificate Revocation List for Arc extensions |
 | 29 | `http://dl.delivery.mp.microsoft.com` | LCM Binaries |
 | 30 | `http://*.tlu.dl.delivery.mp.microsoft.com` | LCM Binaries |
 | 31 | `http://*.windowsupdate.com` | Windows Update |

azure-stack/hci/deploy/deployment-azure-arc-gateway-overview.md

@@ -3,14 +3,14 @@ title: Use Azure gateway without a proxy, version 2408 (preview)
 description: Learn how to use Azure gateway without a proxy, version 2408 (preview). 
 author: alkohli
 ms.topic: how-to
-ms.date: 09/26/2024
+ms.date: 10/07/2024
 ms.author: alkohli
 ms.subservice: azure-stack-hci
 ---
 
 # Use Azure gateway without a proxy (preview)
 
-Applies to: Azure Stack HCI, versions 2408.1, 2408, and 23H2
+Applies to: Azure Stack HCI, version 23H2, releases 2408 and 2408.1
 
 After creating the Arc gateway resource in your Azure subscription, you can enable the new Arc gateway preview features. This article details how to use Azure gateway for Azure Stack HCI systems without a proxy.
 

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

@@ -137,7 +137,7 @@ The following diagram summarizes network intent options available to you for var
 
 :::image type="content" source="media/cloud-deployment-network-considerations/step-3-summary.png" alt-text="Diagram showing step 3 option summary for the network decision framework." lightbox="media/cloud-deployment-network-considerations/step-3-summary.png":::
 
-## Step 4: Determine management network connectivity
+## Step 4: Determine management and storage network connectivity
 
 :::image type="content" source="media/cloud-deployment-network-considerations/step-4.png" alt-text="Diagram showing step 4 of the network decision framework." lightbox="media/cloud-deployment-network-considerations/step-4.png":::
 
@@ -262,6 +262,24 @@ Here are the summarized considerations for the VLAN ID:
 |3     | The management VLAN ID is carried over from the host configuration to the infrastructure VMs during deployment.        |
 |4     | There is no VLAN ID input parameter for Azure portal deployment or for Resource Manager template deployment.        |
 
+### Custom IPs for storage
+
+By default, network ATC will automatically assign the IPs and VLANs for storage from the following table:
+
+|Storage Adapter|IP Address and Subnet|VLAN|
+|---------------|---------------------|----|
+|pNIC1          |10.71.1.x            |711 |
+|pNIC2          |10.71.2.x            |712 |
+|pNIC3          |10.71.3.x            |713 |
+
+However, if your deployment requirements do not fit with those default IPs and VLANs, you can use your own IPs, subnet and VLANs for storage. This functionality is only available when deploying clusters using ARM templates and you will need to specify the following parameters in your template.
+
+- **enableStorageAutoIP:** This parameter, when is not specified is set to true. To enable custom storage IPs during deployment this parameter must be set to false.
+- **storageAdapterIPInfo:** This parameter has a dependency with "enableStorageAutoIP" parameter and is always required when storage auto IP parameter is set to false. Within the "storageAdapterIPInfo" parameter in your ARM template you will also need to specify the **"ipv4Address"** and **"subnetMask"** parameters for each node and network adapter with your own IPs and subnet mask.
+- **vlanId:** As described above in the table, this parameter will use the Network ATC default VLANs if you don't need to change them. However, if those default VLANs does not work in your network you can specify your own VLAN IDs for each of your storage networks.
+
+The following ARM template includes an example of a two nodes HCI cluster with network switch for storage, where storage IPs are customized [2 Nodes deployment with custom storage IPs](https://github.com/Azure/azure-quickstart-templates/blob/master/quickstarts/microsoft.azurestackhci/create-cluster-2-node-switched-custom-storageip/azuredeploy.parameters.json)
+
 ### Node and cluster IP assignment
 
 For Azure Stack HCI system, you have two options to assign IPs for the server nodes and for the cluster IP. 
@@ -338,7 +356,6 @@ Here are the summarized considerations for firewall:
 |1     | Firewall configuration must be done before registering the nodes in Azure Arc.        |
 |2     | Environment Checker in standalone mode can be used to validate the firewall configuration.       |
 
-
 ## Step 5: Determine network adapter configuration
 
 :::image type="content" source="media/cloud-deployment-network-considerations/step-5.png" alt-text="Diagram showing step 5 of the network decision framework." lightbox="media/cloud-deployment-network-considerations/step-5.png":::

azure-stack/hci/deploy/media/deployment-azure-arc-gateway-overview/arc-gateway-component-diagram-2408.png

@@ -191,7 +191,7 @@ items:
       items:
       - name: Configure proxy manually
         href: deploy/deployment-azure-arc-gateway-configure-manually.md
-      - name: Configure proxy via script
+      - name: Configure proxy via Arc script
         href: deploy/deployment-azure-arc-gateway-configure-via-script.md
       - name: Configure without a proxy
         href: deploy/deployment-azure-arc-gateway-use-without-proxy.md