Skip to content

Commit e078b9b

Browse files
authored
Merge pull request #229346 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 d632156 + 67b05fb commit e078b9b

File tree

2 files changed

+13
-29
lines changed

2 files changed

+13
-29
lines changed

articles/operator-nexus/template-cloud-native-network-function-deployment.md

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
title: "Operator Nexus: Sample CNF deployment script"
33
description: "Sample script to create the resources required for CNF deployment on Operator Nexus. After the resources have been created, the Azure Network Function Manager is used to deploy the CNF."
4-
author: atwumbarimah
5-
ms.author: atwumbarimah
6-
ms.date: 01/24/2023
4+
author: dramasamymsft
5+
ms.author: dramasamy
6+
ms.date: 03/02/2023
77
ms.topic: sample
88
# ms.prod: used for on prem applications
99
ms.service: azure
1010
---
1111

1212
# Sample: CNF deployment script
1313

14-
This script creates the resources required to deploy a CNF on an Azure Operator
15-
Distributed Services cluster (instance) on your premises. Once the resources have
14+
This script creates the resources required to deploy a CNF on an Operator
15+
Nexus cluster (instance) on your premises. Once the resources have
1616
been created, the Azure Network Function Manager is used to deploy the CNF.
1717

1818
The first step is to create the workload networks, followed by the AKS-Hybrid
@@ -51,7 +51,7 @@ Get list of `internalnetworks` in the L3 isolation-domain `$myl3isd`
5151
-g "$myrg" --subscription "$mysub"
5252
```
5353

54-
## Create `cloudservicesnetwork`
54+
## Create Cloud Services Network
5555

5656
```bash
5757
export mycsn="******"
@@ -97,13 +97,13 @@ az networkcloud cloudservicesnetwork create --name "$mycsn" \
9797
--debug
9898
```
9999

100-
### Validate `cloudservicesnetwork` has been created
100+
### Validate Cloud Services Network has been created
101101

102102
```azurecli
103103
az networkcloud cloudservicesnetwork show --name "$mycsn" --resource-group "$myrg" --subscription "$mysub" -o table
104104
```
105105

106-
## Create `DefaultCNINetwork` Instance
106+
## Create Default CNI Network
107107

108108
```bash
109109
export myl3n=="******"
@@ -130,7 +130,7 @@ az networkcloud defaultcninetwork create --name "$myl3n" \
130130
--vlan $myvlan
131131
```
132132

133-
### Validate `defaultcninetwork` has been created
133+
### Validate Default CNI Network has been created
134134

135135
```azurecli
136136
az networkcloud defaultcninetwork show --name "$myl3n" \
@@ -143,7 +143,7 @@ az networkcloud defaultcninetwork show --name "$myl3n" \
143143
export myhakscustloc=="******"
144144
```
145145

146-
## Create AKS-Hybrid Network cloud services network vNET
146+
## Create AKS-Hybrid Network Cloud Services Network vNET
147147

148148
The AKS-Hybrid (HAKS) Virtual Networks are different from the Azure to on-premises Virtual Networks.
149149

@@ -161,23 +161,7 @@ az hybridaks vnet create \
161161
--aods-vnet-id "$myncnw"
162162
```
163163

164-
## Create AKS-Hybrid Network default services network vNET
165-
166-
```bash
167-
export myhaksvnetname=="******"
168-
export myncnw=="******"
169-
```
170-
171-
```azurecli
172-
az hybridaks vnet create \
173-
--name "$myhaksvnetname" \
174-
--resource-group "$myrg" \
175-
--subscription "$mysub" \
176-
--custom-location "$myhakscustloc" \
177-
--aods-vnet-id "$myncnw"
178-
```
179-
180-
## Create AKS-Hybrid cluster
164+
## Create AKS-Hybrid Cluster
181165

182166
The AKS-Hybrid (HAKS) cluster will be used to host the CNF.
183167

@@ -211,4 +195,4 @@ az hybridaks create \
211195

212196
## Next Step
213197

214-
Deploy the CNF on the AKS-Hybrid cluster using Azure Network Function Manager.
198+
Deploy the CNF on the AKS-Hybrid Cluster using Azure Network Function Manager.

articles/public-multi-access-edge-compute-mec/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The following key services are available in Azure public MEC:
5858
- Azure Kubernetes for Edge
5959
- Azure Bastion (must be deployed in a virtual network in the parent Azure region)
6060
- Azure managed disks (Azure public MEC supports Standard SSD)
61-
- Azure IoT Edge
61+
- Azure IoT Edge - preview
6262
- Azure Site Recovery (ASR) - preview
6363

6464
The following diagram shows how services are deployed at the Azure public MEC location. With this capability, enterprises and developers can deploy the customer workloads closer to their users.

0 commit comments

Comments
 (0)