Skip to content

Commit 7b75847

Browse files
authored
Merge pull request #222423 from MicrosoftDocs/main
12/26/2022 PM Publish
2 parents c13d91c + 702c1c6 commit 7b75847

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

articles/azure-arc/servers/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ landingContent:
7070
- text: Azure PowerShell
7171
url: /powershell/module/az.connectedmachine/
7272
- text: .NET
73-
url: /dotnet/api/overview/azure/hybridcompute/management
73+
url: /dotnet/api/overview/azure/hybridcompute/management/management-hybridcompute
7474
- text: REST
7575
url: /rest/api/hybridcompute/
7676
- text: Java

articles/azure-arc/servers/onboard-group-policy-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The Group Policy Object, which is used to onboard Azure Arc-enabled servers, req
2727
* Assign the Azure Connected Machine Onboarding role to your service principal and limit the scope of the role to the target Azure landing zone.
2828
* Make a note of the Service Principal Secret; you'll need this value later.
2929

30-
1. Download and unzip the folder **ArcEnabledServersGroupPolicy_v1.0.1** from [https://aka.ms/gp-onboard](https://aka.ms/gp-onboard). This folder contains the ArcGPO project structure with the scripts `EnableAzureArc.ps1`, `DeployGPO.ps1`, and `AzureArcDeployment.psm1`. These assets will be used for onboarding the machine to Azure Arc-enabled servers.
30+
1. Download and unzip the folder **ArcEnabledServersGroupPolicy_v1.0.1** from [https://github.com/Azure/ArcEnabledServersGroupPolicy/releases/download/1.0.2/ArcEnabledServersGroupPolicy_v1.0.2.zip](https://github.com/Azure/ArcEnabledServersGroupPolicy/releases/download/1.0.2/ArcEnabledServersGroupPolicy_v1.0.2.zip). This folder contains the ArcGPO project structure with the scripts `EnableAzureArc.ps1`, `DeployGPO.ps1`, and `AzureArcDeployment.psm1`. These assets will be used for onboarding the machine to Azure Arc-enabled servers.
3131

3232
1. Download the latest version of the [Azure Connected Machine agent Windows Installer package](https://aka.ms/AzureConnectedMachineAgent) from the Microsoft Download Center and save it to the remote share.
3333

articles/virtual-network/deploy-container-networking-docker-linux.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,18 @@ Repeat steps 1 through 13 to add as many configurations as containers you wish t
164164

165165
The Docker container engine must be installed and configured on the virtual machine you created previously.
166166

167+
Sign-in to the virtual machine you created previously with the Azure Bastion host you deployed with the virtual network.
168+
169+
1. In the search box at the top of the portal, enter **Virtual machine**. Select **Virtual machines** in the search results.
170+
171+
2. Select **myVM**.
172+
173+
3. In the **Overview** of **myVM**, select **Connect** then **Bastion**.
174+
175+
4. Enter the username and password you created when you deployed the virtual machine in the previous steps.
176+
177+
5. Select **Connect**.
178+
167179
For install instructions for Docker on an Ubuntu container host, see [Install Docker Engine on Ubuntu](https://docs.docker.com/engine/install/ubuntu/).
168180

169181
After Docker is installed on the virtual machine, follow the instructions for the Linux post install. For instructions on the Linux post install, see [Docker Engine post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/).
@@ -201,8 +213,7 @@ For more information about the Azure CNI plugin, see [Microsoft Azure Container
201213
8. Configure permissions and install the CNI plugin. The install script command requires a version number for the CNI plugin. At the time of the writing of this article, the newest version is **`v1.4.39`**. To obtain the latest version number of the plugin or previous versions, see [Releases](https://github.com/Azure/azure-container-networking/releases).
202214
203215
```bash
204-
cd azure-container-networking
205-
cd scripts
216+
cd ./azure-container-networking/scripts
206217
chmod u+x install-cni-plugin.sh
207218
sudo ./install-cni-plugin.sh v1.4.39
208219
chmod u+x docker-run.sh

0 commit comments

Comments
 (0)