Skip to content

Commit 55ae69b

Browse files
authored
Merge pull request #271915 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents aea666f + b97f2e6 commit 55ae69b

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

articles/expressroute/how-to-configure-coexisting-gateway-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The steps to configure both scenarios are covered in this article. You can confi
3333

3434
* **Only route-based VPN gateway is supported.** You must use a route-based [VPN gateway](../vpn-gateway/vpn-gateway-about-vpngateways.md). You also can use a route-based VPN gateway with a VPN connection configured for 'policy-based traffic selectors' as described in [Connect to multiple policy-based VPN devices](../vpn-gateway/vpn-gateway-connect-multiple-policybased-rm-ps.md).
3535
* **ExpressRoute-VPN Gateway coexist configurations are not supported on the Basic SKU**.
36-
* **Both the ExpressRoute and VPN gateways must be able to communicate with each other via BGP to function properly.** If using a UDR on the gateway subnet, ensure that it does not include a route for the gateway subnet rage itself as this will interfere with BGP traffic.
36+
* **Both the ExpressRoute and VPN gateways must be able to communicate with each other via BGP to function properly.** If using a UDR on the gateway subnet, ensure that it doesn't include a route for the gateway subnet range itself as this will interfere with BGP traffic.
3737
* **If you want to use transit routing between ExpressRoute and VPN, the ASN of Azure VPN Gateway must be set to 65515.** Azure VPN Gateway supports the BGP routing protocol. For ExpressRoute and Azure VPN to work together, you must keep the Autonomous System Number of your Azure VPN gateway at its default value, 65515. If you previously selected an ASN other than 65515 and you change the setting to 65515, you must reset the VPN gateway for the setting to take effect.
3838
* **The gateway subnet must be /27 or a shorter prefix**, such as /26, /25, or you receive an error message when you add the ExpressRoute virtual network gateway.
3939
* **Coexistence for IPv4 traffic only.** ExpressRoute co-existence with VPN gateway is supported, but only for IPv4 traffic. IPv6 traffic isn't supported for VPN gateways.

articles/machine-learning/how-to-package-models.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,21 +230,21 @@ You can create model packages in Azure Machine Learning, using the Azure CLI or
230230

231231
## Package a model that has dependencies in private Python feeds
232232

233-
Model packages can resolve Python dependencies that are available in private feeds. To use this capability, you need to create a connection from your workspace to the feed and specify the credentials. The following Python code shows how you can configure the workspace where you're running the package operation.
233+
Model packages can resolve Python dependencies that are available in private feeds. To use this capability, you need to create a connection from your workspace to the feed and specify the PAT token configuration. The following Python code shows how you can configure the workspace where you're running the package operation.
234234

235235
```python
236236
from azure.ai.ml.entities import WorkspaceConnection
237-
from azure.ai.ml.entities import SasTokenConfiguration
237+
from azure.ai.ml.entities import PatTokenConfiguration
238238

239239
# fetching secrets from env var to secure access, these secrets can be set outside or source code
240-
python_feed_sas = os.environ["PYTHON_FEED_SAS"]
240+
git_pat = os.environ["GIT_PAT"]
241241

242-
credentials = SasTokenConfiguration(sas_token=python_feed_sas)
242+
credentials = PatTokenConfiguration(pat=git_pat)
243243

244244
ws_connection = WorkspaceConnection(
245-
name="<connection_name>",
246-
target="<python_feed_url>",
247-
type="python_feed",
245+
name="<workspace_connection_name>",
246+
target="<git_url>",
247+
type="git",
248248
credentials=credentials,
249249
)
250250

articles/machine-learning/how-to-secure-workspace-vnet.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,12 @@ Azure Container Registry can be configured to use a private endpoint. Use the fo
311311
312312
---
313313
314+
> [!TIP]
315+
> If you have configured your image build compute to use a compute cluster and want to reverse this decision, execute the same command but leave the image-build-compute reference empty:
316+
> ```azurecli
317+
> az ml workspace update --name myworkspace --resource-group myresourcegroup --image-build-compute ''
318+
> ```
319+
314320
> [!TIP]
315321
> When ACR is behind a VNet, you can also [disable public access](../container-registry/container-registry-access-selected-networks.md#disable-public-network-access) to it.
316322

0 commit comments

Comments
 (0)