Skip to content

Commit c06ccc1

Browse files
Merge pull request #3545 from MicrosoftDocs/main638767945135757828sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 12effcd + 0bb10c1 commit c06ccc1

10 files changed

+61
-69
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,15 @@ $ProxyServer = "http://x.x.x.x:port"
6161
6262
$ArcgwId = "/subscriptions/yoursubscription/resourceGroups/yourresourcegroupname/providers/Microsoft.HybridCompute/gateways/yourarcgatewayname"
6363
64+
#Define the bypass list for the proxy. Use comma to separate each item from the list.
65+
# Use "localhost" instead of <local>
66+
# Use specific IPs such as 127.0.0.1 without mask
67+
# Use * for subnets allowlisting. 192.168.1.* for /24 exclusions. Use 192.168.*.* for /16 exclusions.
68+
# Append * for domain names exclusions like *.contoso.com
69+
# DO NOT INCLUDE .svc on the list. The registration script takes care of Environment Variables configuration.
70+
71+
$ProxyBypassList = "localhost,127.0.0.1,*.contoso.com,machine1,machine2,machine3,machine4,machine5,192.168.*.*,AzureLocal-1"
72+
6473
#Connect to your Azure account and subscription
6574
6675
Connect-AzAccount -SubscriptionId $Subscription -TenantId $Tenant -DeviceCode
@@ -75,7 +84,7 @@ $id = (Get-AzContext).Account.Id
7584
7685
#Invoke the registration script with Proxy and ArcgatewayID
7786
78-
Invoke-AzStackHciArcInitialization -SubscriptionID $Subscription -ResourceGroup $RG -TenantID $Tenant -Region australiaeast -Cloud "AzureCloud" -ArmAccessToken $ARMtoken -AccountID $id -Proxy $ProxyServer -ArcGatewayID $ArcgwId
87+
Invoke-AzStackHciArcInitialization -SubscriptionID $Subscription -ResourceGroup $RG -TenantID $Tenant -Region australiaeast -Cloud "AzureCloud" -ArmAccessToken $ARMtoken -AccountID $id -Proxy $ProxyServer -ProxyBypass $ProxyBypassList -ArcGatewayID $ArcgwId
7988
```
8089

8190
## Step 4: Start Azure Local cloud deployment

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ $ProxyServer = "http://x.x.x.x:port"
5555
#Define the Arc gateway resource ID from Azure
5656
$ArcgwId = "/subscriptions/yourarcgatewayid/resourceGroups/yourresourcegroupname/providers/Microsoft.HybridCompute/gateways/yourarcgatewayname"
5757
58-
#Define the bypass list for the proxy. Use semicolon to separate each item from the list.
58+
#Define the bypass list for the proxy. Use comma to separate each item from the list.
5959
# Use "localhost" instead of <local>
6060
# Use specific IPs such as 127.0.0.1 without mask
6161
# Use * for subnets allowlisting. 192.168.1.* for /24 exclusions. Use 192.168.*.* for /16 exclusions.
6262
# Append * for domain names exclusions like *.contoso.com
6363
# DO NOT INCLUDE .svc on the list. The registration script takes care of Environment Variables configuration.
6464
65-
$ProxyBypassList = "localhost;127.0.0.1;*.contoso.com;machine1;machine2;machine3;machine4;machine5;192.168.*.*;AzureLocal-1"
65+
$ProxyBypassList = "localhost,127.0.0.1,*.contoso.com,machine1,machine2,machine3,machine4,machine5,192.168.*.*,AzureLocal-1"
6666
6767
#Connect to your Azure account and Subscription
6868
Connect-AzAccount -SubscriptionId $Subscription -TenantId $Tenant -DeviceCode

azure-local/manage/gpu-preparation.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
---
2-
title: Prepare GPUs for Azure Local (preview)
3-
description: Learn how to prepare GPUs for Azure Local (preview).
2+
title: Prepare GPUs for Azure Local instance
3+
description: Learn how to prepare GPUs for an Azure Local instance.
44
author: alkohli
55
ms.author: alkohli
66
ms.topic: how-to
7-
ms.date: 01/21/2025
7+
ms.date: 03/03/2025
88
ms.service: azure-local
99
---
1010

11-
# Prepare GPUs for Azure Local (preview)
11+
# Prepare GPUs for Azure Local
1212

1313
[!INCLUDE [applies-to](../includes/hci-applies-to-23h2.md)]
1414

1515
This article describes how to prepare graphical processing units (GPUs) on your Azure Local instance for computation-intensive workloads running on Arc virtual machines (VMs) and AKS enabled by Azure Arc. GPUs are used for computation-intensive workloads such as machine learning and deep learning.
1616

17-
> [!IMPORTANT]
18-
> This feature is currently in PREVIEW.
19-
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
2017

2118
## Attaching GPUs on Azure Local
2219

Binary file not shown.
-2.97 KB
Loading

azure-local/manage/virtual-machine-image-azure-marketplace.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.topic: how-to
77
ms.service: azure-local
88
ms.custom:
99
- devx-track-azurecli
10-
ms.date: 12/10/2024
10+
ms.date: 03/04/2025
1111
---
1212

1313
# Create Azure Local VM image using Azure Marketplace images
@@ -26,13 +26,17 @@ Before you begin, make sure that the following prerequisites are completed.
2626

2727
- Make sure you have the **Azure Connected Machine Resource Manager** role. For more information, see [Assign Azure roles](/azure/role-based-access-control/role-assignments-portal).
2828

29+
- Make sure that your subscription is registered with the `Microsoft.EdgeMarketplace` resource provider. For more information, see [Register resource provider](/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider).
30+
2931
- If using a client to connect to your Azure Local instance, see [Connect to the system remotely](./azure-arc-vm-management-prerequisites.md#connect-to-the-system-remotely).
3032

3133
# [Azure portal](#tab/azureportal)
3234

3335
- Make sure to review and [complete the prerequisites](./azure-arc-vm-management-prerequisites.md).
3436

3537
- Make sure you have the **Azure Connected Machine Resource Manager** role. For more information, see [Assign Azure roles](/azure/role-based-access-control/role-assignments-portal).
38+
39+
- Make sure that your subscription is registered with the `Microsoft.EdgeMarketplace` resource provider. For more information, see [Register resource provider](/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider).
3640
---
3741

3842
## Add VM image from Azure Marketplace
@@ -98,8 +102,8 @@ Follow these steps to create a VM image using the Azure CLI.
98102
99103
| Name | Publisher | Offer | SKU |
100104
|------|-----------|-------|------|
101-
| Windows 11 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win11-23h2-avd-m365 |
102-
| Windows 10 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win10-21h2-avd-m365<br>win10-22h2-avd-m365 |
105+
| Windows 11 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win11-23h2-avd-m365 <br> win11-24h2-avd-m365 |
106+
| Windows 10 Enterprise multi-session + Microsoft 365 | microsoftwindowsdesktop | office-365 | win10-21h2-avd-m365 |
103107
| Windows 11 Pro | microsoftwindowsdesktop | windows-11 | win11-23h2-pro |
104108
| Windows 11 Enterprise | microsoftwindowsdesktop | windows-11 | win11-22h2-ent<br>win11-23h2-ent<br>win11-24h2-ent |
105109
| Windows 11 Enterprise multi-session | microsoftwindowsdesktop | windows-11 | win11-22h2-avd<br>win11-23h2-avd<br>win11-24h2-avd |

0 commit comments

Comments
 (0)