Skip to content

Commit f7051e0

Browse files
authored
Merge pull request #279308 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 ba8a4e4 + 0b81398 commit f7051e0

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

articles/openshift/openshift-faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ sections:
199199
answer: |
200200
Azure Disk (Premium_LRS) is configured as the default storage class. For additional storage providers, and for configuration details (including Azure File), see the Red Hat documentation on [persistent storage](https://docs.openshift.com/container-platform/4.6/storage/understanding-persistent-storage.html).
201201
202-
## Does ARO store any customer data outside of the cluster's region?
203-
202+
- question: Does ARO store any customer data outside of the cluster's region?
203+
answer: |
204204
No. All data created in an ARO cluster is maintained within the cluster's region.
205205

articles/virtual-machines/linux/azure-hybrid-benefit-linux.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ To enable Azure Hybrid Benefit when you create a virtual machine, use the follow
5858

5959
![Screenshot of the Azure portal that shows checkboxes selected for licensing.](./media/azure-hybrid-benefit/create-vm-ahb-checkbox.png)
6060
1. Create a virtual machine by following the next set of instructions.
61-
1. On the **Configuration** pane, confirm that the option is enabled.
61+
1. On the **Operating System** pane, confirm that the option is enabled.
6262

63-
![Screenshot of the Azure Hybrid Benefit configuration pane after you create a virtual machine.](./media/azure-hybrid-benefit/create-configuration-blade.png)
63+
![Screenshot of the Azure Hybrid Benefit configuration pane after you create a virtual machine.](./media/azure-hybrid-benefit/azure-hybrid-benefit.png)
6464

6565
#### [Azure CLI](#tab/ahbNewCli)
6666

@@ -86,9 +86,9 @@ To enable Azure Hybrid Benefit on an existing virtual machine:
8686

8787
1. Go to the [Azure portal](https://portal.azure.com/).
8888
1. Open the virtual machine page on which you want to apply the conversion.
89-
1. Go to **Configuration** > **Licensing**. To enable the Azure Hybrid Benefit conversion, select **Yes**, and then select the confirmation checkbox.
89+
1. Go to **Operating System** > **Licensing**. To enable the Azure Hybrid Benefit conversion, select **Yes**, and then select the confirmation checkbox.
9090

91-
![Screenshot of the Azure portal that shows the Licensing section of the configuration page for Azure Hybrid Benefit.](./media/azure-hybrid-benefit/create-configuration-blade.png)
91+
![Screenshot of the Azure portal that shows the Licensing section of the configuration page for Azure Hybrid Benefit.](./media/azure-hybrid-benefit/azure-hybrid-benefit.png)
9292

9393
#### [Azure CLI](#tab/ahbExistingCli)
9494

105 KB
Loading

articles/virtual-network/ip-services/associate-public-ip-address-vm.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ Install [Azure PowerShell](/powershell/azure/install-azure-powershell) on your m
218218
1. Open the necessary ports in your security groups by adjusting the security rules in the network security groups. For information, see [Allow network traffic to the VM](#allow-network-traffic-to-the-vm).
219219

220220
---
221+
> [!NOTE]
222+
> To share a VM with an external user, you must add a public IP address to the VM. Alternatively, external users can connect to VM's private IP address through Azure Bastion.
221223
222224
## Allow network traffic to the VM
223225

articles/virtual-network/virtual-network-troubleshoot-connectivity-problem-between-vms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ For more information, see [Add network interfaces to or remove from virtual mach
5656

5757
### Step 2: Check whether network traffic is blocked by NSG or UDR
5858

59-
Use [Network Watcher IP Flow Verify](../network-watcher/network-watcher-ip-flow-verify-overview.md) and [Connection troubleshoot](../network-watcher/network-watcher-connectivity-overview.md) to determine whether there's a Network Security Group (NSG) or User-Defined Route (UDR) that is interfering with traffic flow.
59+
Use [Network Watcher IP Flow Verify](../network-watcher/network-watcher-ip-flow-verify-overview.md) and [Connection troubleshoot](../network-watcher/network-watcher-connectivity-overview.md) to determine whether there's a Network Security Group (NSG) or User-Defined Route (UDR) that is interfering with traffic flow. You may need to add inbound rules on both NSGs. The rules must be at the subnet level and the virtual machine's interface level.
6060

6161
### Step 3: Check whether network traffic is blocked by VM firewall
6262

@@ -103,4 +103,4 @@ If you can't connect to a VM network share, the problem may be caused by unavail
103103
Use [Network Watcher IP Flow Verify](../network-watcher/network-watcher-ip-flow-verify-overview.md) and [NSG Flow Logging](../network-watcher/network-watcher-nsg-flow-logging-overview.md) to determine whether there's an NSG or UDR that is interfering with traffic flow. You can also verify your Inter-VNet configuration [here](https://support.microsoft.com/en-us/help/4032151/configuring-and-validating-vnet-or-vpn-connections).
104104

105105
### Need help? Contact support.
106-
If you still need help, [contact support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade) to get your issue resolved quickly.
106+
If you still need help, [contact support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade) to get your issue resolved quickly.

articles/virtual-network/virtual-networks-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Azure resources communicate securely with each other in one of the following way
4646

4747
- **Virtual network**: You can deploy VMs and other types of Azure resources in a virtual network. Examples of resources include App Service Environments, Azure Kubernetes Service (AKS), and Azure Virtual Machine Scale Sets. To view a complete list of Azure resources that you can deploy in a virtual network, see [Deploy dedicated Azure services into virtual networks](virtual-network-for-azure-services.md).
4848

49+
> [!NOTE]
50+
> To move a virtual machine from one virtual network to another, you must delete and recreate the virtual machine in the new virtual network. The virtual machine's disks can be retained for use in the new virtual machine.
51+
4952
- **Virtual network service endpoint**: You can extend your virtual network's private address space and the identity of your virtual network to Azure service resources over a direct connection. Examples of resources include Azure Storage accounts and Azure SQL Database. Service endpoints allow you to secure your critical Azure service resources to only a virtual network. To learn more, see [Virtual network service endpoints](virtual-network-service-endpoints-overview.md).
5053

5154
- **Virtual network peering**: You can connect virtual networks to each other by using virtual peering. The resources in either virtual network can then communicate with each other. The virtual networks that you connect can be in the same, or different, Azure regions. To learn more, see [Virtual network peering](virtual-network-peering-overview.md).

0 commit comments

Comments
 (0)